Bug 541767 - "Various problems with how config/my{config,rules}.mk are handled" [r=ted]
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 04 Feb 2010 09:19:00 -0500
changeset 38163 83156d780a717bc50eaaa693fbc9ee49a8d70bb8
parent 38162 169bc036ce30a92b329e38bbfb9a3f27166b2050
child 38164 7d7bb59427b43f4a38b08ba3e88a109678fc597c
push idunknown
push userunknown
push dateunknown
reviewersted
bugs541767
milestone1.9.3a2pre
Bug 541767 - "Various problems with how config/my{config,rules}.mk are handled" [r=ted]
Makefile.in
config/rules.mk
js/src/config/rules.mk
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,17 +78,17 @@ TIERS += testharness
 ifdef ENABLE_TESTS
 tier_testharness_dirs += testing/xpcshell
 endif
 
 include $(topsrcdir)/config/config.mk
 
 GARBAGE_DIRS += dist _javagen _profile _tests staticlib
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
-   dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
+   dependencies.beos config/autoconf.mk \
    unallmakefiles mozilla-config.h \
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
 
 default alldep all:: $(topsrcdir)/configure config.status
 	$(RM) -rf $(DIST)/sdk
 	$(RM) -rf $(DIST)/include
 	$(RM) -rf $(DIST)/private
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -2094,22 +2094,16 @@ endif
 endif
 endif
 #############################################################################
 
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/app-rules.mk
 -include $(MY_RULES)
 
 #
-# This speeds up gmake's processing if these files don't exist.
-#
-$(MY_CONFIG) $(MY_RULES):
-	@touch $@
-
-#
 # Generate Emacs tags in a file named TAGS if ETAGS was set in $(MY_CONFIG)
 # or in $(MY_RULES)
 #
 ifdef ETAGS
 ifneq ($(CSRCS)$(CPPSRCS)$(HEADERS),)
 all:: TAGS
 TAGS:: $(CSRCS) $(CPPSRCS) $(HEADERS)
 	$(ETAGS) $(CSRCS) $(CPPSRCS) $(HEADERS)
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -2089,22 +2089,16 @@ endif
 endif
 endif
 #############################################################################
 
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/app-rules.mk
 -include $(MY_RULES)
 
 #
-# This speeds up gmake's processing if these files don't exist.
-#
-$(MY_CONFIG) $(MY_RULES):
-	@touch $@
-
-#
 # Generate Emacs tags in a file named TAGS if ETAGS was set in $(MY_CONFIG)
 # or in $(MY_RULES)
 #
 ifdef ETAGS
 ifneq ($(CSRCS)$(CPPSRCS)$(HEADERS),)
 all:: TAGS
 TAGS:: $(CSRCS) $(CPPSRCS) $(HEADERS)
 	$(ETAGS) $(CSRCS) $(CPPSRCS) $(HEADERS)