From c6c12f94150e86dfdc4251fea7e5fe8e661b0250 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Fri, 28 Apr 2006 14:54:54 +0000 Subject: [PATCH] Bug 333308 - make clean/distclean misses various files, patch by Mike Hommey , r=me git-svn-id: svn://10.0.0.236/trunk@195642 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 1 + mozilla/build/unix/Makefile.in | 2 +- mozilla/extensions/java/xpcom/interfaces/Makefile.in | 2 +- mozilla/extensions/java/xpcom/src/Makefile.in | 2 +- mozilla/extensions/pref/system-pref/src/gconf/Makefile.in | 2 ++ mozilla/profile/dirserviceprovider/standalone/Makefile.in | 2 ++ mozilla/security/manager/Makefile.in | 2 ++ mozilla/toolkit/library/Makefile.in | 1 + mozilla/toolkit/library/libxul-rules.mk | 2 ++ mozilla/toolkit/mozapps/downloads/src/Makefile.in | 1 + mozilla/toolkit/mozapps/extensions/src/Makefile.in | 1 + mozilla/toolkit/mozapps/update/src/Makefile.in | 1 + mozilla/toolkit/xre/Makefile.in | 6 ++---- mozilla/xpcom/build/Makefile.in | 2 +- mozilla/xpcom/glue/standalone/Makefile.in | 2 +- 15 files changed, 20 insertions(+), 9 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 0ce28252c8c..588cd864941 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -517,6 +517,7 @@ GARBAGE_DIRS += dist DIST_GARBAGE = config.cache config.log config.status config-defs.h \ dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \ unallmakefiles mozilla-config.h \ + gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out # Build pseudo-external modules first when export is explicitly called diff --git a/mozilla/build/unix/Makefile.in b/mozilla/build/unix/Makefile.in index 137588f4b4c..6c7b7bc3350 100644 --- a/mozilla/build/unix/Makefile.in +++ b/mozilla/build/unix/Makefile.in @@ -71,7 +71,7 @@ pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \ $(MOZ_APP_NAME)-js.pc \ $(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc -GARBAGE = $(pkg_config_files) mozilla-config +GARBAGE = $(pkg_config_files) $(MOZ_APP_NAME)-config $(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk cat $< | sed \ diff --git a/mozilla/extensions/java/xpcom/interfaces/Makefile.in b/mozilla/extensions/java/xpcom/interfaces/Makefile.in index b9157cf7696..b1f6cf292a4 100644 --- a/mozilla/extensions/java/xpcom/interfaces/Makefile.in +++ b/mozilla/extensions/java/xpcom/interfaces/Makefile.in @@ -63,7 +63,7 @@ GEN_JAVA_SRCS = \ # install jars into SDK SDK_LIBRARY = $(JARFILE) $(JARFILE_SRC) -GARBAGE += $(JARFILE) $(JARFILE_SRC) $(GEN_JAVA_SRCS) java.files +GARBAGE += $(JARFILE) $(JARFILE_SRC) $(GEN_JAVA_SRCS) java.files .done GARBAGE_DIRS += _javagen org include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/java/xpcom/src/Makefile.in b/mozilla/extensions/java/xpcom/src/Makefile.in index c1431f82998..b7427fb464f 100755 --- a/mozilla/extensions/java/xpcom/src/Makefile.in +++ b/mozilla/extensions/java/xpcom/src/Makefile.in @@ -86,7 +86,7 @@ endif # necessary until we do 'cvs move' to put files in correct directories LOCAL_INCLUDES += -I$(srcdir) -GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files +GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files .done GARBAGE_DIRS += _javagen org include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/pref/system-pref/src/gconf/Makefile.in b/mozilla/extensions/pref/system-pref/src/gconf/Makefile.in index 4235dfc3628..44810c6f81a 100644 --- a/mozilla/extensions/pref/system-pref/src/gconf/Makefile.in +++ b/mozilla/extensions/pref/system-pref/src/gconf/Makefile.in @@ -82,3 +82,5 @@ LOCAL_INCLUDES = -I$(srcdir)/.. export:: $(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp . + +GARBAGE += nsSystemPrefFactory.cpp diff --git a/mozilla/profile/dirserviceprovider/standalone/Makefile.in b/mozilla/profile/dirserviceprovider/standalone/Makefile.in index 8b183c4f5bf..ee386324ab5 100644 --- a/mozilla/profile/dirserviceprovider/standalone/Makefile.in +++ b/mozilla/profile/dirserviceprovider/standalone/Makefile.in @@ -67,3 +67,5 @@ DEFINES += -DXPCOM_GLUE export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS) $(INSTALL) $^ . + +GARBAGE = $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)) diff --git a/mozilla/security/manager/Makefile.in b/mozilla/security/manager/Makefile.in index ae252b90a95..f405d7685c7 100644 --- a/mozilla/security/manager/Makefile.in +++ b/mozilla/security/manager/Makefile.in @@ -224,6 +224,8 @@ endif touch $@ endif +GARBAGE += .nss.cleaned + .nss.checkout: ifndef MOZ_NATIVE_NSS touch $(srcdir)/$@ diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in index e6f1bfa2caa..7db073004ad 100644 --- a/mozilla/toolkit/library/Makefile.in +++ b/mozilla/toolkit/library/Makefile.in @@ -131,6 +131,7 @@ GARBAGE += \ $(RDF_UTIL_SRC_LCPPSRCS) \ $(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \ $(wildcard *.$(OBJ_SUFFIX)) \ + dlldeps-javaxpcom.cpp \ $(NULL) else ifdef NS_TRACE_MALLOC diff --git a/mozilla/toolkit/library/libxul-rules.mk b/mozilla/toolkit/library/libxul-rules.mk index 6cc20766e8c..d0785117f03 100644 --- a/mozilla/toolkit/library/libxul-rules.mk +++ b/mozilla/toolkit/library/libxul-rules.mk @@ -91,3 +91,5 @@ export:: dlldeps.cpp dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp $(INSTALL) $^ . + +GARBAGE += dlldeps.cpp diff --git a/mozilla/toolkit/mozapps/downloads/src/Makefile.in b/mozilla/toolkit/mozapps/downloads/src/Makefile.in index 98d2645aa0f..c60451ddb7d 100644 --- a/mozilla/toolkit/mozapps/downloads/src/Makefile.in +++ b/mozilla/toolkit/mozapps/downloads/src/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = helperAppDlg EXTRA_COMPONENTS = nsHelperAppDlg.js +GARBAGE += nsHelperAppDlg.js include $(topsrcdir)/config/rules.mk diff --git a/mozilla/toolkit/mozapps/extensions/src/Makefile.in b/mozilla/toolkit/mozapps/extensions/src/Makefile.in index e6f3e2fbcbd..b7d46362d9f 100644 --- a/mozilla/toolkit/mozapps/extensions/src/Makefile.in +++ b/mozilla/toolkit/mozapps/extensions/src/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = extensions EXTRA_COMPONENTS = nsExtensionManager.js +GARBAGE += nsExtensionManager.js include $(topsrcdir)/config/rules.mk diff --git a/mozilla/toolkit/mozapps/update/src/Makefile.in b/mozilla/toolkit/mozapps/update/src/Makefile.in index 2b63ef749ab..d3fa200950c 100644 --- a/mozilla/toolkit/mozapps/update/src/Makefile.in +++ b/mozilla/toolkit/mozapps/update/src/Makefile.in @@ -49,6 +49,7 @@ DIRS = updater endif EXTRA_COMPONENTS = nsUpdateService.js +GARBAGE += nsUpdateService.js ifeq ($(OS_ARCH),WINNT) EXTRA_COMPONENTS += nsPostUpdateWin.js diff --git a/mozilla/toolkit/xre/Makefile.in b/mozilla/toolkit/xre/Makefile.in index e2c16772db5..e9f5d9b5fe5 100644 --- a/mozilla/toolkit/xre/Makefile.in +++ b/mozilla/toolkit/xre/Makefile.in @@ -160,16 +160,14 @@ endif SHAREDCPPSRCS += nsSigHandlers.cpp endif -GARBAGE += $(SHAREDSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) ifeq ($(OS_ARCH),WINNT) -GARBAGE += $(addprefix $(srcdir)/,$(SHAREDSRCS)) +GARBAGE += $(addprefix $(srcdir)/,$(SHAREDCPPSRCS)) endif ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) -ifndef MOZ_ENABLE_LIBXUL GARBAGE += $(STACKWALK_SRC_LCSRCS) endif -endif SHARED_LIBRARY_LIBS += ../profile/src/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX) diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in index dee18bd674d..7879f3b35fa 100644 --- a/mozilla/xpcom/build/Makefile.in +++ b/mozilla/xpcom/build/Makefile.in @@ -158,7 +158,7 @@ endif # UNIX98 iconv support OS_LIBS += $(LIBICONV) -GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUENS_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/glue/standalone/Makefile.in b/mozilla/xpcom/glue/standalone/Makefile.in index a65c73fe76a..d5b1cde0ebb 100644 --- a/mozilla/xpcom/glue/standalone/Makefile.in +++ b/mozilla/xpcom/glue/standalone/Makefile.in @@ -99,7 +99,7 @@ FORCE_STATIC_LIB = 1 # Force use of PIC FORCE_USE_PIC = 1 -GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) SRCS_IN_OBJDIR = 1