Renaming 'install' build phase to 'libs'

Bug #56601 r=pavlov

Makefile.in

@@ -43,6 +43,9 @@ else
 default: $(SUBMAKEFILES)
 	$(MAKE) nspr
 	$(MAKE) tier_0
+ifdef MOZ_LDAP_XPCOM
+	$(MAKE) -C directory/c-sdk/ldap
+endif
 	$(MAKE) tier_1
 	$(MAKE) tier_9
 
@@ -170,7 +173,7 @@ tier_9_dirs	+= security/manager
 endif
 
 ifdef MOZ_LDAP_XPCOM
-tier_9_dirs	+= directory/c-sdk/ldap directory/xpcom
+tier_9_dirs	+= directory/xpcom
 endif
 
 ifdef MOZ_EXTENSIONS
@@ -229,7 +232,7 @@ tier_%:
 	done ; \
 	$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include ;\
 	for d in $($@_dirs); do $(UPDATE_TITLE) \
-		$(MAKE) -C $$d install; \
+		$(MAKE) -C $$d libs; \
 	done
 #
 # Individual modules
@@ -254,5 +257,3 @@ export::
 distclean::
 	cat unallmakefiles | $(XARGS) rm -f
 	rm -f unallmakefiles $(DIST_GARBAGE)
-
-

build/Makefile.in

@@ -34,6 +34,6 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 # Install bloaturls.txt file for tinderbox Bloaty test.
-install:: bloaturls.txt
+libs:: bloaturls.txt
 	$(INSTALL) $< $(DIST)/bin
 

build/unix/Makefile.in

@@ -33,5 +33,5 @@ export::
 	chmod 755 mozilla-config
 	$(INSTALL) -m 755 mozilla-config $(DIST)/bin
 
-install:: $(srcdir)/run-mozilla.sh
+libs:: $(srcdir)/run-mozilla.sh
 	$(INSTALL) $< $(DIST)/bin

client.mk

@@ -356,7 +356,7 @@ endif
 # 
 
 # Print out any options loaded from mozconfig.
-all build checkout clean depend distclean export install realclean::
+all build checkout clean depend distclean export libs install realclean::
 	@if test -f .mozconfig.out; then \
 	  cat .mozconfig.out; \
 	  rm -f .mozconfig.out; \
@@ -594,7 +594,7 @@ build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
 # Other targets
 
 # Pass these target onto the real build system
-install export clean realclean distclean:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
+install export libs clean realclean distclean:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	$(MOZ_MAKE) $@
 
 cleansrcdir:
@@ -615,4 +615,4 @@ cleansrcdir:
 # (! IS_FIRST_CHECKOUT)
 endif
 
-.PHONY: checkout real_checkout depend build export install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything
+.PHONY: checkout real_checkout depend build export libs install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything

config/rules.mk

@@ -25,7 +25,7 @@
 # Pass 1. export  - Create generated headers and stubs.  Publish public headers
 #                   to dist/include.
 #
-# Pass 2. install - Create libraries & programs.  Publish them to dist/bin.
+# Pass 2. libs - Create libraries & programs.  Publish them to dist/bin.
 #
 # `gmake` will build each of these properly, but `gmake -jN` may break
 # use `gmake MAKE='gmake -jN'` instead
@@ -472,10 +472,10 @@ endif
 
 ################################################################################
 
-all:: export install
+all:: export libs
 
 # Do depend as well
-alldep:: export depend install
+alldep:: export depend libs
 
 # Do everything from scratch
 everything:: clean alldep
@@ -587,7 +587,7 @@ endif # EXPORT_LIBRARY
 endif # LIBRARY_NAME
 
 ##############################################
-install:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(MAPS)
+libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(MAPS)
 ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
 ifdef LIBRARY
 ifeq ($(OS_ARCH),OS2)
@@ -1187,7 +1187,7 @@ endif
 #
 # JMC_GEN -- for generating java modules
 #
-# Provide default export & install rules when using JMC_GEN
+# Provide default export & libs rules when using JMC_GEN
 #
 ifneq ($(JMC_GEN),)
 INCLUDES		+= -I$(JMC_GEN_DIR) -I.
@@ -1293,7 +1293,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE)
 $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
 	$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $^
 
-install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
+libs:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
 	$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DIST)/bin/$(COMPONENTS_PATH)
 
 endif
@@ -1312,7 +1312,7 @@ else
 _JAR_REGCHROME_DISABLE_JAR=0
 endif
 
-install:: $(CHROME_DEPS)
+libs:: $(CHROME_DEPS)
 	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
 	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DIST)/bin/chrome $(JAR_MANIFEST); fi
 

content/xbl/builtin/Makefile.in

@@ -38,5 +38,5 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-install:: $(TARGETS)
+libs:: $(TARGETS)
 	$(INSTALL) $(srcdir)/htmlBindings.xml $(DIST)/bin/res/builtin

content/xbl/builtin/mac/Makefile.in

@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-install:: $(TARGETS)
+libs:: $(TARGETS)
 	$(INSTALL) $(srcdir)/button-disabled-left.gif $(DIST)/bin/res/builtin
 	$(INSTALL) $(srcdir)/button-disabled-middle.gif $(DIST)/bin/res/builtin
 	$(INSTALL) $(srcdir)/button-disabled-right.gif $(DIST)/bin/res/builtin

content/xbl/builtin/unix/Makefile.in

@@ -28,6 +28,6 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-install:: $(TARGETS)
+libs:: $(TARGETS)
 	$(INSTALL) $(srcdir)/platformHTMLBindings.xml $(DIST)/bin/res/builtin
 	$(INSTALL) $(srcdir)/xbl-forms.css $(DIST)/bin/res/builtin

content/xbl/builtin/win/Makefile.in

@@ -42,6 +42,6 @@ BUILTIN_RESOURCES = \
 
 include $(topsrcdir)/config/rules.mk
 
-install:: $(BUILTIN_RESOURCES)
+libs:: $(BUILTIN_RESOURCES)
 	$(INSTALL) $^ $(DIST)/bin/res/builtin
 

directory/xpcom/base/resources/Makefile.in

@@ -46,6 +46,6 @@ XPIDL_MODULE	= mozldap
 
 include $(topsrcdir)/config/rules.mk
 
-install::
+libs::
 	@$(REGCHROME) content mozldap comm.jar
 	@$(REGCHROME) locale en-US/mozldap en-US.jar

directory/xpcom/datasource/Makefile.in

@@ -42,5 +42,5 @@ JSFILES         = $(srcdir)/nsLDAPDataSource.js
 
 include $(topsrcdir)/config/rules.mk
 
-install::
+libs::
 	$(INSTALL) $(JSFILES) $(DIST)/bin/components

editor/Makefile.in

@@ -30,7 +30,7 @@ DIRS		= public idl libeditor composer txmgr txtsvc
 
 include $(topsrcdir)/config/rules.mk
 
-install::
+libs::
 	@$(REGCHROME) content editor comm.jar
 	@$(REGCHROME) content editor-region comm.jar
 	@$(REGCHROME) locale en-US/editor en-US.jar

embedding/browser/chrome/Makefile.in

@@ -27,7 +27,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-install::
+libs::
 	@$(REGCHROME) content embed embed-sample.jar
 	@$(REGCHROME) skin modern/embed embed-sample.jar
 	@$(REGCHROME) locale en-US/embed embed-sample.jar

embedding/components/ui/helperAppDlg/Makefile.in

@@ -36,5 +36,5 @@ JSCOMPONENTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-install:: $(JSCOMPONENTS)
+libs:: $(JSCOMPONENTS)
 	$(INSTALL) $^ $(DIST)/bin/components

embedding/config/Makefile.in

@@ -45,7 +45,7 @@ else
 	-$(RM) -rf $(DIST)/Embed/tmpchrome
 endif
 
-install:: embed_chrome
+libs:: embed_chrome
 	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/basebrowser-unix -o unix -v
 	$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome
 

extensions/access-builtin/accessproxy/Makefile.in

@@ -70,5 +70,5 @@ include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
-install:: $(TARGETS)
+libs:: $(TARGETS)
 

extensions/content-packs/resources/Makefile.in

@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-install::
+libs::
 	$(REGCHROME) content content-packs content-packs.jar
 	$(REGCHROME) locale en-US/content-packs en-US.jar
 

extensions/cookie/Makefile.in

@@ -85,6 +85,6 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-install::
+libs::
 	@$(REGCHROME) content cookie comm.jar
 	@$(REGCHROME) locale en-US/cookie en-US.jar

extensions/ctl/src/pangoLite/Makefile.in

@@ -69,5 +69,5 @@ CFLAGS    += $(GLIB_CFLAGS)
 EXTRA_DSO_LDOPTS += $(GLIB_LIBS) -lgmodule
 
 # Install pango.modules file for Shaping Modules.
-install::
+libs::
 	$(INSTALL) $(srcdir)/pango.modules $(DIST)/bin

extensions/cview/resources/Makefile.in

@@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-install::
+libs::
 	@$(REGCHROME) content cview cview.jar
 	@$(REGCHROME) skin modern/cview cview.jar
 	@$(REGCHROME) locale en-US/cview cview.jar