X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=a9a59de8c1ab8120c17b953c6d4e62f0209e6528;hb=9f57b18d28f8f4ab604ebeba5a0c23d17d2f8c65;hp=f9b834b79dcef1450b3920fce75f93de841d2e4a;hpb=9cf662b367795f07ddf2c6deca33839b6581548b;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index f9b834b79dc..a9a59de8c1a 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: DIRS = $(DIRS:runtime=)
 tools-only: all
 
-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
-
 # Install support for llvm include files:
 .PHONY: install-includes
 
 install-includes:
-	$(MKDIR) $(includedir)/llvm
+	$(MKDIR) $(DESTDIR)$(includedir)/llvm
 	cd include && find * '!' '(' -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 * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
+endif
 
 install:: install-includes