From 34476449c2373fae69e47297cc43e620fd030d6c Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com" <seawood%netscape.com>
Date: Thu, 27 Sep 2001 21:30:42 +0000
Subject: [PATCH] Turn on module dependency tracking. Bug #59454 sr=alecf

---
 config/Makefile.in    | 2 --
 config/autoconf.mk.in | 1 -
 config/config.mak     | 2 +-
 config/config.mk      | 4 +---
 config/rules.mak      | 4 ----
 config/rules.mk       | 4 ----
 configure.in          | 1 -
 7 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/config/Makefile.in b/config/Makefile.in
index 0f82671536b6..e00c717b151c 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -79,9 +79,7 @@ endif
 
 export:: $(TARGETS) $(HEADERS)
 	$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
-ifdef MOZ_TRACK_MODULE_DEPS
 	$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(HEADERS)
-endif
 	-rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
 
 GARBAGE += build_number nsBuildID.h
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index ff407ac6463b..f8b3ec2b033a 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -30,7 +30,6 @@ DIST		= $(DEPTH)/dist
 
 MOZ_DISABLE_JAR_PACKAGING = @MOZ_DISABLE_JAR_PACKAGING@
 MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
-MOZ_TRACK_MODULE_DEPS	= @MOZ_TRACK_MODULE_DEPS@
 
 MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
 MOZ_GFX_TOOLKIT	= $(MOZ_WIDGET_TOOLKIT)
diff --git a/config/config.mak b/config/config.mak
index 61e961f48d0b..4fd1ee5cc42e 100644
--- a/config/config.mak
+++ b/config/config.mak
@@ -71,7 +71,7 @@ WINOS=$(WINOS: =)^
 #//-----------------------------------------------------------------------
 
 XPDIST=$(DEPTH)\dist
-!if defined(MOZ_TRACK_MODULE_DEPS) && defined(MODULE)
+!ifdef MODULE
 PUBLIC=$(XPDIST)\include\$(MODULE)
 !else
 PUBLIC=$(XPDIST)\include
diff --git a/config/config.mk b/config/config.mk
index 983207ee23f6..c7680004e139 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -407,9 +407,7 @@ JAVA_OPTIMIZER	= -g
 XBCFLAGS	= -FR$*
 endif
 
-ifdef MOZ_TRACK_MODULE_DEPS
 REQ_INCLUDES	= $(foreach d,$(REQUIRES),-I$(DIST)/include/$d)
-endif
 
 INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) -I$(PUBLIC) -I$(DIST)/include $(OS_INCLUDES)
 
@@ -464,7 +462,7 @@ endif
 LIBS_DIR	= -L$(DIST)/bin -L$(DIST)/lib
 
 # Default location of include files
-ifdef MOZ_TRACK_MODULE_DEPS
+ifdef MODULE
 PUBLIC		= $(DIST)/include/$(MODULE)
 else
 PUBLIC		= $(DIST)/include
diff --git a/config/rules.mak b/config/rules.mak
index 831e26ff8e48..d320749e870c 100644
--- a/config/rules.mak
+++ b/config/rules.mak
@@ -711,9 +711,7 @@ include <$(DEPTH)/config/java.inc>
 export:: $(EXPORTS)
     @echo +++ make: exporting headers
  	$(MAKE_INSTALL:/=\) $(MKCPYFLAGS) $(EXPORTS) $(PUBLIC)
-!ifdef MOZ_TRACK_MODULE_DEPS
 	$(PERL) -I$(DEPTH)\config $(DEPTH)\config\build-list.pl $(PUBLIC)/.headerlist $(EXPORTS)
-!endif
 
 #// don't delete exported stuff on a local clobber, use clobber_all
 #clobber::
@@ -820,9 +818,7 @@ export:: $(XPDIST)\idl
 export:: $(XPIDL_GEN_DIR) $(XPIDL_HEADERS) $(PUBLIC)
         @echo +++ make: exporting generated XPIDL header files
         $(MAKE_INSTALL) $(XPIDL_HEADERS:/=\) $(PUBLIC)
-!ifdef MOZ_TRACK_MODULE_DEPS
 	$(PERL) -I$(DEPTH)\config $(DEPTH)\config\build-list.pl $(PUBLIC)/.headerlist $(XPIDL_HEADERS)
-!endif
 
 !ifndef NO_GEN_XPT
 install:: $(XPIDL_GEN_DIR) $(TYPELIB)
diff --git a/config/rules.mk b/config/rules.mk
index 914687825448..c85dfe3d2cb4 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1174,9 +1174,7 @@ endif
 ifneq ($(EXPORTS),)
 export:: $(EXPORTS) $(PUBLIC)
 	$(INSTALL) $(IFLAGS1) $^
-ifdef MOZ_TRACK_MODULE_DEPS
 	$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $(filter-out $(PUBLIC),$^))
-endif
 endif 
 
 ################################################################################
@@ -1233,9 +1231,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
 
 export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(PUBLIC)
 	$(INSTALL) $(IFLAGS1) $^
-ifdef MOZ_TRACK_MODULE_DEPS
 	$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $(filter-out $(PUBLIC),$^))
-endif
 
 ifndef NO_GEN_XPT
 # generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
diff --git a/configure.in b/configure.in
index 20734733b2a1..59c67696d410 100644
--- a/configure.in
+++ b/configure.in
@@ -4026,7 +4026,6 @@ dnl =
 dnl = Maintainer debug option (no --enable equivalent)
 dnl =
 dnl ========================================================
-AC_SUBST(MOZ_TRACK_MODULE_DEPS)
 
 AC_SUBST(AR)
 AC_SUBST(AR_FLAGS)