From eaa5f00519cb2d48732e83cb0ff43a971090bdaa Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Mon, 12 Feb 2007 16:11:52 +0000 Subject: [PATCH] build system garbage + Makefile.in, browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in, browser/components/microsummaries/src/Makefile.in, build/unix/Makefile.in, config/Makefile.in, config/static-rules.mk, extensions/pref/system-pref/src/gconf/Makefile.in, profile/dirserviceprovider/standalone/Makefile.in, security/manager/Makefile.in, toolkit/library/Makefile.in, toolkit/mozapps/downloads/src/Makefile.in, toolkit/mozapps/extensions/src/Makefile.in, toolkit/mozapps/update/src/Makefile.in, toolkit/xre/Makefile.in, xpcom/build/Makefile.in, xpcom/glue/standalone/Makefile.in, xpfe/components/filepicker/src/Makefile.in: adding GARBAGE files that are not properly cleaned up during make clean/distclean. cleaned files: --- Makefile.in | 1 + allmakefiles.sh | 3 --- .../Makefile.in | 2 ++ browser/components/microsummaries/src/Makefile.in | 1 + browser/components/shell/src/Makefile.in | 11 +++-------- browser/locales/Makefile.in | 2 ++ build/unix/Makefile.in | 2 +- config/Makefile.in | 2 ++ config/static-rules.mk | 2 ++ extensions/pref/system-pref/src/gconf/Makefile.in | 2 ++ profile/dirserviceprovider/standalone/Makefile.in | 2 ++ security/manager/Makefile.in | 2 ++ toolkit/library/Makefile.in | 4 ++++ toolkit/mozapps/downloads/src/Makefile.in | 1 + toolkit/mozapps/extensions/src/Makefile.in | 1 + toolkit/mozapps/update/src/Makefile.in | 1 + toolkit/xre/Makefile.in | 6 ++---- xpcom/build/Makefile.in | 2 +- xpcom/glue/standalone/Makefile.in | 2 +- xpfe/components/filepicker/src/Makefile.in | 1 + 20 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Makefile.in b/Makefile.in index 157ed1e..eefd575 100644 --- a/Makefile.in +++ b/Makefile.in @@ -447,6 +447,7 @@ STATIC_MAKEFILES := nsprpub directory/c-sdk security/nss 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 \ + gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ unallmakefiles mozilla-config.h \ $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out diff --git a/allmakefiles.sh b/allmakefiles.sh index 4feb236..2813d83 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -1528,9 +1528,6 @@ for extension in $MOZ_EXTENSIONS; do " ;; xmlextras ) MAKEFILES_extensions="$MAKEFILES_extensions extensions/xmlextras/Makefile - extensions/xmlextras/base/Makefile - extensions/xmlextras/base/src/Makefile - extensions/xmlextras/base/public/Makefile extensions/xmlextras/pointers/Makefile extensions/xmlextras/pointers/src/Makefile extensions/xmlextras/build/Makefile diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in index 9fc0e57..82b1e67 100644 --- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in @@ -55,3 +55,5 @@ libs:: install:: $(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + +GARBAGE += $(FILES) diff --git a/browser/components/microsummaries/src/Makefile.in b/browser/components/microsummaries/src/Makefile.in index f821a3e..2f64e00 100644 --- a/browser/components/microsummaries/src/Makefile.in +++ b/browser/components/microsummaries/src/Makefile.in @@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = microsummaries EXTRA_COMPONENTS = nsMicrosummaryService.js +GARBAGE += nsMicrosummaryService.js include $(topsrcdir)/config/rules.mk diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in index e54510e..d98f607 100644 --- a/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/src/Makefile.in @@ -76,21 +76,16 @@ endif ifdef CPPSRCS LIBRARY_NAME = shellservice_s -endif - +endif FORCE_STATIC_LIB = 1 +EXTRA_COMPONENTS = nsSetDefaultBrowser.js + include $(topsrcdir)/config/rules.mk DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" -JS_SET_BROWSER_COMPONENT = nsSetDefaultBrowser.js - CXXFLAGS += $(TK_CFLAGS) -libs:: - $(INSTALL) $(srcdir)/$(JS_SET_BROWSER_COMPONENT) $(DIST)/bin/components - clobber:: rm -f $(DIST)/lib/$(LIBRARY_NAME).lib - rm -f $(DIST)/bin/components/$(JS_SET_BROWSER_COMPONENT) diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 4f9506e..9e1d66f 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -56,6 +56,8 @@ SUBMAKEFILES += \ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ $(NULL) + +GARBAGE = $(SUBMAKEFILES) endif # This makefile uses variable overrides from the libs-% target to diff --git a/build/unix/Makefile.in b/build/unix/Makefile.in index ae51c07..48ec46b 100644 --- a/build/unix/Makefile.in +++ b/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)-gtkmozembed.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/config/Makefile.in b/config/Makefile.in index fb8ab12..f816bc1 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -141,6 +141,8 @@ export:: -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers $(INSTALL) system_wrappers $(DIST)/include + +GARBAGE_DIRS += system_wrappers endif # we don't use an explicit dependency here because then we would diff --git a/config/static-rules.mk b/config/static-rules.mk index 5c2134c..af56e01 100644 --- a/config/static-rules.mk +++ b/config/static-rules.mk @@ -14,6 +14,8 @@ nsStaticComponents.cpp: $(topsrcdir)/config/nsStaticComponents.cpp.in Makefile M sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \ > $(_TARGET) +GARBAGE += nsStaticComponents.cpp + ifeq ($(OS_ARCH),IRIX) LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=80 endif diff --git a/extensions/pref/system-pref/src/gconf/Makefile.in b/extensions/pref/system-pref/src/gconf/Makefile.in index 4b2317f..9fb3630 100644 --- a/extensions/pref/system-pref/src/gconf/Makefile.in +++ b/extensions/pref/system-pref/src/gconf/Makefile.in @@ -87,3 +87,5 @@ LOCAL_INCLUDES = -I$(srcdir)/.. export:: $(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp . + +GARBAGE += nsSystemPrefFactory.cpp diff --git a/profile/dirserviceprovider/standalone/Makefile.in b/profile/dirserviceprovider/standalone/Makefile.in index cc47cc7..d86e38d 100644 --- a/profile/dirserviceprovider/standalone/Makefile.in +++ b/profile/dirserviceprovider/standalone/Makefile.in @@ -65,3 +65,5 @@ LOCAL_INCLUDES = -I$(srcdir)/../src export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS) $(INSTALL) $^ . + +GARBAGE = $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)) diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in index a85afcc..ad2db7a 100644 --- a/security/manager/Makefile.in +++ b/security/manager/Makefile.in @@ -226,6 +226,8 @@ endif touch $@ endif +GARBAGE += .nss.cleaned + .nss.checkout: ifndef MOZ_NATIVE_NSS touch $(srcdir)/$@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 0ea33a3..88fb8f2 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -400,9 +400,13 @@ dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp $(INSTALL) $^ . +GARBAGE += dlldeps.cpp dlldeps-obs.cpp + ifdef MOZ_JAVAXPCOM export:: dlldeps-javaxpcom.cpp dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp $(INSTALL) $^ . + +GARBAGE += dlldeps-javaxpcom.cpp endif diff --git a/toolkit/mozapps/downloads/src/Makefile.in b/toolkit/mozapps/downloads/src/Makefile.in index 98d2645..c60451d 100644 --- a/toolkit/mozapps/downloads/src/Makefile.in +++ b/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/toolkit/mozapps/extensions/src/Makefile.in b/toolkit/mozapps/extensions/src/Makefile.in index e6f3e2f..b7d4636 100644 --- a/toolkit/mozapps/extensions/src/Makefile.in +++ b/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/toolkit/mozapps/update/src/Makefile.in b/toolkit/mozapps/update/src/Makefile.in index 2b63ef7..d3fa200 100644 --- a/toolkit/mozapps/update/src/Makefile.in +++ b/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/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 0393000..95b7173 100644 --- a/toolkit/xre/Makefile.in +++ b/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/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 0344216..ac3712e 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -151,7 +151,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/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in index 54823cd..727ed7e 100644 --- a/xpcom/glue/standalone/Makefile.in +++ b/xpcom/glue/standalone/Makefile.in @@ -96,7 +96,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 diff --git a/xpfe/components/filepicker/src/Makefile.in b/xpfe/components/filepicker/src/Makefile.in index f0112c2..6374919 100644 --- a/xpfe/components/filepicker/src/Makefile.in +++ b/xpfe/components/filepicker/src/Makefile.in @@ -69,6 +69,7 @@ CPPSRCS = \ $(NULL) EXTRA_COMPONENTS = nsFilePicker.js +GARBAGE += nsFilePicker.js include $(topsrcdir)/config/rules.mk -- 1.4.4.4