diff options
| -rw-r--r-- | Makefile.rules | 16 | ||||
| -rw-r--r-- | autoconf/configure.ac | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules index 7dfb2b4150..09c0a9c172 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -28,6 +28,13 @@ TopLevelTargets := check dist dist-check dist-clean tags dist-gzip dist-bzip2 \ UserTargets := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets) InternalTargets := preconditions distdir dist-hook +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 + ################################################################################ # INITIALIZATION: Basic things the makefile needs ################################################################################ @@ -77,6 +84,9 @@ ifneq ($(MakefileConfigIn),) PreConditions += $(MakefileConfig) endif +FilesToConfigPATH := $(addprefix $(PROJ_OBJ_ROOT)/,$(FilesToConfig)) +PreConditions += $(FilesToConfigPATH) + preconditions : $(PreConditions) #------------------------------------------------------------------------ @@ -134,6 +144,11 @@ $(ConfigStatusScript): $(ConfigureScript) $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \ $(ConfigStatusScript) +.PRECIOUS: $(FilesToConfigPATH) +$(FilesToConfigPATH) : $(PROJ_OBJ_ROOT)/% : $(PROJ_SRC_ROOT)/%.in + $(Echo) Regenerating $* + $(Verb) cd $(PROJ_OBJ_ROOT) && $(ConfigStatusScript) $* + #------------------------------------------------------------------------ # Make sure the configuration makefile is up to date #------------------------------------------------------------------------ @@ -1576,3 +1591,4 @@ printvars:: $(Echo) "YaccFiles : " '$(YaccFiles)' $(Echo) "LexFiles : " '$(LexFiles)' $(Echo) "Module : " '$(Module)' + $(Echo) "FilesToConfig: " '$(FilesToConfigPATH)' diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 0c184516e3..661fc1d350 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -634,6 +634,10 @@ dnl=== dnl===-----------------------------------------------------------------------=== dnl Configure header files +dnl WARNING: dnl If you add or remove any of the following config headers, then +dnl you MUST also update Makefile.rules so that the variable FilesToConfig +dnl contains the same list of files as AC_CONFIG_HEADERS below. This ensures the +dnl files can be updated automatically when their *.in sources change. AC_CONFIG_HEADERS([include/llvm/Config/config.h]) AC_CONFIG_HEADERS([include/llvm/Support/DataTypes.h]) AC_CONFIG_HEADERS([include/llvm/ADT/hash_map]) |