This is still broken

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index d221175a98b5b84967ac4f971105bc8c5ceb4d92..b474a3a0674e65e1c1380d9c89a7d1da534230ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,15 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/System lib/Support utils lib tools 
+DIRS = lib/System lib/Support utils lib
 
-ifneq ($(MAKECMDGOALS),tools-only)
-DIRS += runtime docs
-OPTIONAL_DIRS = examples projects
+ifeq ($(MAKECMDGOALS),tools-only)
+DIRS += tools
+else
+  ifneq ($(MAKECMDGOALS),libs-only)
+    DIRS += tools runtime docs
+    OPTIONAL_DIRS = examples projects
+  endif
 endif
 
 EXTRA_DIST := test llvm.spec include
@@ -46,3 +50,22 @@ dist-hook::
          $(TopDistDir)/include/llvm/Support/ThreadSupport.h
 
 tools-only: all
+libs-only: all
+
+#------------------------------------------------------------------------
+# Make sure the generated headers are up-to-date. This must be kept in
+# sync with the AC_CONFIG_HEADER invocations in autoconf/configure.ac
+#------------------------------------------------------------------------
+FilesToConfig := \
+  include/llvm/Config/config.h \
+  include/llvm/Support/DataTypes.h \
+  include/llvm/ADT/hash_map \
+  include/llvm/ADT/hash_set \
+  include/llvm/ADT/iterator
+FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
+
+all-local:: $(FilesToConfigPATH)
+$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in 
+       $(Echo) Regenerating $*
+       $(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
+.PRECIOUS: $(FilesToConfigPATH)