Fix insertion of SelectInsts.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index f9b834b79dcef1450b3920fce75f93de841d2e4a..7146bfbef52ef6d0e99dcd254b1ffd90a8b7a539 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,13 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = .
-DIRS = lib/Support utils lib tools runtime
+DIRS = lib/Support utils lib tools 
 OPTIONAL_DIRS = projects
 
+ifneq ($(MAKECMDGOALS),tools-only)
+DIRS += runtime
+endif
+
 include $(LEVEL)/Makefile.common
 
 test :: all
@@ -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