Bug 546642 - More cleanup during 'make clean' and 'make distclean' [r=Callek]
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,16 +108,16 @@ buildsymbols ::
include $(topsrcdir)/config/rules.mk
ifndef MOZILLA_1_9_2_BRANCH
# defined in (mozilla/.../)package-name.mk
export MOZ_SOURCE_STAMP
endif
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
- dependencies.beos \
- unallmakefiles mozilla-config.h \
+ dependencies.beos config/autoconf.mk \
+ unallmakefiles comm-config.h \
$(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
distclean::
cat unallmakefiles | $(XARGS) rm -f
rm -f $(DIST_GARBAGE)
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -265,17 +265,17 @@ install:: $(MOZ_APP_NAME).1
chmod +x $@
libs:: $(MOZ_APP_NAME)
$(INSTALL) $< $(DIST)/bin
install:: $(MOZ_APP_NAME)
$(SYSINSTALL) $< $(DESTDIR)$(bindir)
-GARBAGE += $(MOZ_APP_NAME)
+GARBAGE += $(MOZ_APP_NAME) $(MOZ_APP_NAME).1
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, browser-prefs.js)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
LIBS += -lphexlib
endif
ifdef WINCE
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -157,16 +157,18 @@ SEARCH_PLUGINS = $(shell cat \
$(NSINSTALL) -D profile
# the #include in the .in file requires both to be in the same dir
cp $^ profile/
for engine in $(SEARCH_PLUGINS); do \
echo " <RDF:li resource=\"NC:SearchCategory?engine=urn:search:engine:$$engine.src\" />" >> profile/search.rdf.inc; \
done
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py profile/search.rdf.in > $@
+GARBAGE_DIRS += profile
+
libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
libs:: $(FINAL_TARGET)/defaults/profile/search.rdf ;
libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
libs:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))