X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=a61d7f3dde1bb211f955756c359912caf0b41fc4;hb=69c5889d603133454a3f06c200cff689eee916cc;hp=f574193388acce0a65a7323af4d5deac1d3b8888;hpb=6fdaf4a219cd8ae3ff51fd5b731f8fce1b97d336;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index f574193388a..a61d7f3dde1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,18 @@
-##===- ./Makefile ------------------------------------------*- Makefile -*-===##
+#===- ./Makefile -------------------------------------------*- Makefile -*--===#
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file was developed by the LLVM research group and is distributed under
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
-##===----------------------------------------------------------------------===##
+#===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/Support utils lib tools runtime
+DIRS = lib/Support utils lib tools 
+
+ifneq ($(MAKECMDGOALS),tools-only)
+DIRS += runtime
 OPTIONAL_DIRS = projects
+endif
 
 include $(LEVEL)/Makefile.common
 
@@ -22,21 +26,17 @@ distclean:: clean
 	                  $(LEVEL)/config.log \
 	                  $(LEVEL)/TAGS
 
-tools-only:
-	@for dir in lib/Support utils lib tools; do $(MAKE) -C $$dir; done
-
-configure: autoconf/configure.ac autoconf/aclocal.m4
-	cd autoconf && aclocal && autoconf -o ../configure configure.ac
-
-include/Config/config.h.in: autoconf/configure.ac autoconf/aclocal.m4
-	autoheader -I autoconf autoconf/configure.ac
+tools-only: all
 
 # Install support for llvm include files:
 .PHONY: install-includes
 
 install-includes:
-	$(MKDIR) $(includedir)/llvm
-	cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
+	$(MKDIR) $(DESTDIR)$(includedir)/llvm
+	cd include && find * -path '*/Internal' -prune -o '(' '!' '(' -name '*~' -o -name .cvsignore ')' -print ')' | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
+ifneq ($(BUILD_SRC_ROOT),$(BUILD_OBJ_ROOT))
+	cd $(BUILD_SRC_ROOT)/include && find * -path '*/Internal' -prune -o '(' '!' '(' -name '*~' -o -name .cvsignore ')' -print ')' | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
+endif
 
 install:: install-includes
 
@@ -45,8 +45,8 @@ install:: install-includes
 
 TAGS: tags
 
-all:: tags
+all::
 
 tags:
-	$(ETAGS) $(ETAGSFLAGS) `find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h'`
+	find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h' | $(ETAGS) $(ETAGSFLAGS) -