Bug 935387 - Remove non recursed install targets. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 07 Nov 2013 10:37:45 +0900
changeset 153896 f8b8df4a133ace9ffaf19c6257bc3741f57cca4c
parent 153895 ef8689cf657afac632c04ffd226998df8384753e
child 153897 2eb99b1ad61f79fc78c075618aab6e55cec975f3
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs935387
milestone28.0a1
Bug 935387 - Remove non recursed install targets. r=mshal
b2g/locales/Makefile.in
browser/locales/Makefile.in
browser/metro/shell/Makefile.in
config/Makefile.in
content/xml/content/src/Makefile.in
editor/composer/src/Makefile.in
extensions/spellcheck/locales/Makefile.in
intl/locale/src/Makefile.in
intl/locales/Makefile.in
intl/unicharutil/tables/Makefile.in
layout/generic/Makefile.in
layout/mathml/Makefile.in
layout/style/Makefile.in
layout/svg/Makefile.in
netwerk/test/Makefile.in
rdf/tests/dsds/Makefile.in
toolkit/xre/Makefile.in
tools/jprof/Makefile.in
xpcom/sample/Makefile.in
xpcom/tests/Makefile.in
xulrunner/app/profile/Makefile.in
xulrunner/app/profile/chrome/Makefile.in
--- a/b2g/locales/Makefile.in
+++ b/b2g/locales/Makefile.in
@@ -52,21 +52,16 @@ include $(topsrcdir)/toolkit/locales/l10
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
 
 libs::
 	@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
 	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
 	    $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \
 	fi
-install::
-	@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
-	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
-	    $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(DESTDIR)$(mozappdir)/defaults/existing-profile-defaults.js; \
-	fi
 
 NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$*
 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -115,24 +115,16 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J
 libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
 
 libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
 
 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
-install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
-
-install:: $(addprefix generic/profile/,$(PROFILE_FILES))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-
-install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
-
 # metro build calls back here for search engine plugins
 searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS))
 .PHONY: searchplugins
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$*
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
--- a/browser/metro/shell/Makefile.in
+++ b/browser/metro/shell/Makefile.in
@@ -1,9 +1,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 export::
 	$(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin
-
-install::
-	$(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -106,19 +106,16 @@ STL_WRAPPERS_SENTINEL = $(DIST)/stl_wrap
 	touch $(STL_WRAPPERS_SENTINEL)
 
 export:: $(STL_WRAPPERS_SENTINEL)
 
 GARBAGE += $(STL_WRAPPERS_SENTINEL)
 GARBAGE_DIRS += stl_wrappers
 endif
 
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir)
-
 GARBAGE += \
   $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) buildid $(srcdir)/*.pyc *.pyc
 
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 elf-dynstr-gc: elf-dynstr-gc.c $(GLOBAL_DEPS) $(call mkdir_deps,$(MDDEPDIR))
 	$(CC) $(COMPILE_CFLAGS) $(GLIB_CFLAGS) -DELFDYNSTRGC_BUILD -o $@ $< $(LDFLAGS) $(GLIB_LIBS)
 endif
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -9,11 +9,8 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../base/src \
 		$(NULL)
 
 EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/htmlmathml-f.ent \
 		$(NULL)
 libs::
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_CONTENT) $(DESTDIR)$(mozappdir)/res/dtd
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -25,11 +25,8 @@ include $(topsrcdir)/config/rules.mk
 	$(srcdir)/res/table-remove-column.gif \
 	$(srcdir)/res/table-remove-row-active.gif \
 	$(srcdir)/res/table-remove-row-hover.gif \
 	$(srcdir)/res/table-remove-row.gif \
 	$(NULL)
 
 libs::
 	$(INSTALL) $(_FILES) $(DIST)/bin/res
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(_FILES) $(DESTDIR)$(mozappdir)/res
--- a/extensions/spellcheck/locales/Makefile.in
+++ b/extensions/spellcheck/locales/Makefile.in
@@ -6,12 +6,9 @@ DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
 
 DICTIONARY_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/hunspell/*.dic) $(wildcard $(LOCALE_SRCDIR)/hunspell/*.aff))
 
 ifneq (,$(DICTIONARY_FILES))
 libs::
 	$(INSTALL)  $(DICTIONARY_FILES) $(FINAL_TARGET)/dictionaries
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(DICTIONARY_FILES) $(DESTDIR)$(mozappdir)/dictionaries
 endif
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -25,11 +25,8 @@ charsetalias.properties.h: props2arrays.
 	$(PYTHON) $^ $@
 
 GARBAGE += \
 	charsetalias.properties.h \
 	$(NULL)
 
 libs::
 	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/res
--- a/intl/locales/Makefile.in
+++ b/intl/locales/Makefile.in
@@ -6,12 +6,9 @@ DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
 
 PATTERN_FILES = $(strip $(wildcard $(srcdir)/*/hyphenation/*.dic))
 
 ifneq (,$(PATTERN_FILES))
 libs::
 	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(PATTERN_FILES) $(DESTDIR)$(mozappdir)/hyphenation
 endif
--- a/intl/unicharutil/tables/Makefile.in
+++ b/intl/unicharutil/tables/Makefile.in
@@ -16,11 +16,8 @@ include $(topsrcdir)/config/rules.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 CFLAGS          += $(MOZ_QT_CFLAGS)
 CXXFLAGS        += $(MOZ_QT_CFLAGS)
 endif
 
 libs:: $(_PROP_TABLES)
 	$(INSTALL) $^ $(DIST)/bin/res/entityTables
-
-install:: $(_PROP_TABLES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/entityTables
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -30,11 +30,8 @@ CXXFLAGS += $(TK_CFLAGS)
 endif
 
 ifdef MOZ_ENABLE_QT
 CXXFLAGS += $(MOZ_QT_CFLAGS)
 endif
 
 libs::
 	$(INSTALL) $(RESOURCES_HTML) $(DIST)/bin/res/html
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(RESOURCES_HTML) $(DESTDIR)$(mozappdir)/res/html
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -29,19 +29,16 @@ font_properties = \
 ifeq ($(TARGET_MD_ARCH),win32)
 font_properties += \
 	mathfontSymbol.properties
 endif
 
 libs:: $(font_properties)
 	$(INSTALL) $^ $(DIST)/bin/res/fonts
 
-install:: $(font_properties)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts
-
 math_properties = mathfont.properties
 
 $(DIST)/bin/res/fonts/$(math_properties) $(DESTDIR)$(mozappdir)/res/fonts/$(math_properties): $(math_properties) Makefile
 	test -d $(@D) || $(NSINSTALL) -D $(@D)
 	rm -f $@
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py --marker=% $(DEFINES) $(ACDEFINES) $< > $@
 
 libs:: $(DIST)/bin/res/fonts/$(math_properties)
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -38,11 +38,8 @@ nsStyleStructList.h : $(srcdir)/generate
 
 GARBAGE	+= \
 	$(addprefix $(DIST)/bin/res/,$(_FILES)) \
 	nsStyleStructList.h \
 	$(NULL)
 
 libs:: $(_FILES)
 	$(INSTALL) $^ $(DIST)/bin/res
-
-install:: $(_FILES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -12,11 +12,8 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../xul/base/src \
 		-I$(srcdir)/../../content/svg/content/src \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../widget \
 		$(NULL)
 
 libs::
 	$(INSTALL) $(srcdir)/svg.css $(DIST)/bin/res
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/svg.css $(DESTDIR)$(mozappdir)/res
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -17,17 +17,15 @@ include $(topsrcdir)/config/rules.mk
 check::
 	$(RUN_TEST_PROGRAM) $(DIST)/bin/TestCookie$(BIN_SUFFIX)
 
 _RES_FILES 	= urlparse.dat \
 		  urlparse_unx.dat \
 		  $(NULL)
 libs:: $(_RES_FILES)
 	$(INSTALL) $^ $(DIST)/bin/res
-install:: $(_RES_FILES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res
 
 # One of the xpcshell unit tests needs this file, so make sure it winds
 #  up in the test directory.
 libs::
 	$(NSINSTALL) -D $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/data
 	$(INSTALL) $(topsrcdir)/netwerk/dns/effective_tld_names.dat \
           $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
--- a/rdf/tests/dsds/Makefile.in
+++ b/rdf/tests/dsds/Makefile.in
@@ -19,11 +19,8 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(RESOURCE_SAMPLES))
 
 libs::
 	$(INSTALL) $(addprefix $(srcdir)/,$(RESOURCE_SAMPLES)) $(SAMPLES_DIR)
-
-install:: $(RESOURCE_SAMPLES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/samples/rdf
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -184,11 +184,8 @@ DEFINES += -DAPP_ID="$(MOZ_APP_ID)"
 
 platform.ini: FORCE
 	$(PYTHON) $(srcdir)/make-platformini.py --buildid=$(GRE_BUILDID) $(INIARGS) $(milestone_txt) > $@
 
 GARBAGE += platform.ini
 
 libs:: platform.ini
 	$(INSTALL) $^ $(DIST)/bin
-
-install::
-	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
--- a/tools/jprof/Makefile.in
+++ b/tools/jprof/Makefile.in
@@ -13,11 +13,8 @@ OS_LIBS = \
 HELPER_SCRIPTS	= jprofsig
 HELPER_SCRIPTS	:= $(addprefix $(srcdir)/, $(HELPER_SCRIPTS))
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/stub \
 	$(NULL)
-
-install::
-	$(INSTALL) -m 555 $(HELPER_SCRIPTS)  $(DIST)/bin
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -27,11 +27,8 @@ EXTRA_DSO_LDOPTS += \
 		$(TK_LIBS) \
 		$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 libs:: $(TARGETS)
 	$(INSTALL) $(srcdir)/xpconnect-sample.html $(DIST)/bin/res/samples
-
-install:: $(TARGETS)
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/xpconnect-sample.html $(DESTDIR)$(mozappdir)/res/samples
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -21,19 +21,16 @@ LOCAL_INCLUDES	= \
 		$(NULL)
 
 libs::
 	$(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res
 ifneq (,$(SIMPLE_PROGRAMS))
 	$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
 endif
 
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/test.properties $(DESTDIR)$(mozappdir)/res
-
 ifeq (,$(filter-out WINNT os2-emx, $(HOST_OS_ARCH)))
 getnativepath = $(call normalizepath,$(1))
 else
 getnativepath = $(1)
 endif
 
 abs_srcdir = $(abspath $(srcdir))
 
--- a/xulrunner/app/profile/Makefile.in
+++ b/xulrunner/app/profile/Makefile.in
@@ -7,12 +7,8 @@ include $(topsrcdir)/config/rules.mk
 
 FILES := \
 	localstore.rdf \
 	$(NULL)
 
 libs:: $(FILES)
 	$(INSTALL) $^ $(DIST)/bin/defaults/profile
 	$(INSTALL) $^ $(DIST)/bin/defaults/profile/US
-
-install:: $(FILES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/US
--- a/xulrunner/app/profile/chrome/Makefile.in
+++ b/xulrunner/app/profile/chrome/Makefile.in
@@ -10,12 +10,8 @@ FILES := \
 	userChrome-example.css \
 	$(NULL)
 
 FILES := $(addprefix $(srcdir)/, $(FILES))
 
 libs::
 	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/chrome
 	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/US/chrome
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/chrome
-	$(NSINSTALL)  -t $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/US/chrome