[vmkit-commits] [vmkit] r180406 - auto auto-dep

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:06:34 2013
New Revision: 180406

URL: http://llvm.org/viewvc/llvm-project?rev=180406&view=rev
Log:
auto auto-dep
(cherry picked from commit 232f415016ef92d819451198b37243bd3e422cef)

Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/Makefile.rules
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=180406&r1=180405&r2=180406&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu Apr 25 12:06:34 2013
@@ -109,4 +109,7 @@ else
 	PRECOMPILER_FLAGS	:=
 endif
 
-include $(VMKIT_SRC_ROOT)/Makefile.rules
+CONFIG_FILES=@ac_config_files@
+CONFIG_HEADERS=@ac_config_headers@
+
+include $(PROJ_SRC_ROOT)/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180406&r1=180405&r2=180406&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:06:34 2013
@@ -49,7 +49,7 @@ ifndef VERBOSE
 endif
 
 ###############################################################################
-#   Build system managament
+#   Recursive target managment
 ###############################################################################
 #SELF=$(PROJ_SRC_ROOT)/Makefile.rules Makefile $(PROJ_SRC_ROOT)/Makefile.common
 RECURSIVE_TARGETS=all clean
@@ -78,6 +78,26 @@ confclean: distclean
 	$(Verb) $(MKDIR) $(dir $@) && $(TOUCH) $@
 
 ###############################################################################
+#   Build system managment
+###############################################################################
+SELF=$(LEVEL)/Makefile.rules Makefile $(PROJ_SRC_ROOT)/Makefile.common
+
+define define_config_rule
+$(LEVEL)/$1: $1.in $(PROJ_SRC_ROOT)/configure
+	$(Echo) Regenerating project files $$@
+	$(Verb) cd $(PROJ_OBJ_ROOT) && ./config.status -q --$2=$$@
+	$(Verb) touch $$@
+endef
+
+$(foreach cur,$(CONFIG_FILES),$(eval $(call define_config_rule,$(cur),file)))
+$(foreach cur,$(CONFIG_HEADERS),$(eval $(call define_config_rule,$(cur),header)))
+
+$(PROJ_SRC_ROOT)/configure: $(PROJ_SRC_ROOT)/autoconf/configure.ac $(PROJ_SRC_ROOT)/autoconf/AutoRegen.sh 
+	$(Echo) Rebootstraping project
+	$(Verb) cd $(PROJ_SRC_ROOT)/autoconf && ./AutoRegen.sh
+	$(Verb) ./config.status --recheck
+
+###############################################################################
 #   Build directories
 ###############################################################################
 BIN_DIR=$(PROJ_OBJ_ROOT)/$(BUILD_NAME)/bin

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=180406&r1=180405&r2=180406&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Thu Apr 25 12:06:34 2013
@@ -443,5 +443,7 @@ AC_CONFIG_FILES([mmtk/java/build.xml])
 dnl Do special configuration of Makefiles
 AC_CONFIG_MAKEFILE(Makefile)
 
+AC_SUBST([ac_config_files])
+AC_SUBST([ac_config_headers])
 
 AC_OUTPUT

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=180406&r1=180405&r2=180406&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Thu Apr 25 12:06:34 2013
@@ -607,6 +607,8 @@ ac_includes_default="\
 ac_unique_file=""Makefile.common.in""
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+ac_config_headers
+ac_config_files
 EGREP
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -5975,6 +5977,8 @@ ac_config_commands="$ac_config_commands
 
 
 
+
+
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure