X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=b474a3a0674e65e1c1380d9c89a7d1da534230ce;hb=20a86db26a94ca6ca61baa11176c07b8c61e4b01;hp=fec284d0727e9462787df623033a58fdb56e0d06;hpb=8b1f7676bddcf099e30b849f511ad5a6a86ea8a0;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index fec284d0727..b474a3a0674 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ ifeq ($(MAKECMDGOALS),tools-only)
 DIRS += tools
 else
   ifneq ($(MAKECMDGOALS),libs-only)
-    DIRS += runtime docs
+    DIRS += tools runtime docs
     OPTIONAL_DIRS = examples projects
   endif
 endif
@@ -51,3 +51,21 @@ dist-hook::
 
 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)