Rename real_install target as install. NSPRPUB_PRE_4_2_CLIENT_BRANCH
authorcls%seawood.org
Wed, 23 Nov 2005 06:30:33 +0000
branchNSPRPUB_PRE_4_2_CLIENT_BRANCH
changeset 3510 34dcc277cb455bd314a4fcffdfef7a37dc99f0f6
parent 3508 9989006673bf438a9b69e023bf8bb2f87cc61b42
child 3514 16f5859a70e5db818e697cb8104b6cb1dad91678
push idunknown
push userunknown
push dateunknown
bugs304239
Rename real_install target as install. Thanks to Wan-Teh Chang <wtchang@redhat.com> for the patch. Bug #304239 r=cls
config/Makefile.in
config/rules.mk
lib/msgc/tests/Makefile.in
lib/tests/windows/makefile
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -150,11 +150,11 @@ endif
 $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LD) $(EXEFLAGS) $<
 else
 	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
 endif
 
-real_install:: nspr.m4
+install:: nspr.m4
 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
 	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -32,26 +32,28 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 ################################################################################
-# We have a 4 pass build process:
-#
-# Pass 1. export - Create generated headers and stubs. Publish public headers to
-#		dist/<arch>/include.
+# We used to have a 4 pass build process.  Now we do everything in one pass.
 #
-# Pass 2. libs - Create libraries. Publish libraries to dist/<arch>/lib.
+# export - Create generated headers and stubs. Publish public headers to
+#          dist/<arch>/include.
+#          Create libraries. Publish libraries to dist/<arch>/lib.
+#          Create programs. 
 #
-# Pass 3. all - Create programs. 
+# libs - obsolete.  Now a synonym of "export".
 #
-# Pass 4. install - Publish programs to dist/<arch>/bin.
+# all - the default makefile target.  Now a synonym of "export".
+#
+# install - Install headers, libraries, and programs on the system.
 #
 # Parameters to this makefile (set these before including):
 #
 # a)
 #	TARGETS	-- the target to create 
 #			(defaults to $LIBRARY $PROGRAM)
 # b)
 #	DIRS	-- subdirectories for make to recurse on
@@ -200,35 +202,33 @@ endif
 
 all:: export
 
 export::
 	+$(LOOP_OVER_DIRS)
 
 libs:: export
 
-install:: export
-
 clean::
 	rm -rf $(OBJS) $(RES) so_locations $(NOSUCHFILE) $(GARBAGE)
 	+$(LOOP_OVER_DIRS)
 
 clobber::
 	rm -rf $(OBJS) $(RES) $(TARGETS) $(filter-out . ..,$(OBJDIR)) $(GARBAGE) so_locations $(NOSUCHFILE)
 	+$(LOOP_OVER_DIRS)
 
 realclean clobber_all::
 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH)
 	+$(LOOP_OVER_DIRS)
 
 distclean::
 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
 	+$(LOOP_OVER_DIRS)
 
-real_install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
 ifdef RELEASE_BINS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
 endif
 ifdef RELEASE_HEADERS
 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
 endif
 ifdef RELEASE_LIBS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
--- a/lib/msgc/tests/Makefile.in
+++ b/lib/msgc/tests/Makefile.in
@@ -305,11 +305,10 @@ ifeq ($(OS_ARCH),OS2)
 	$(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
 else
 	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBGC) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
 endif
 endif
 endif
 
 export:: $(TARGETS)
-export:: install
 clean::
 	rm -f $(TARGETS)
--- a/lib/tests/windows/makefile
+++ b/lib/tests/windows/makefile
@@ -75,12 +75,10 @@ LIBPR += kernel32.lib user32.lib gdi32.l
 
 include $(MOD_DEPTH)/config/rules.mk
 
 $(OBJDIR)/winevent.exe: $(OBJS)
 	link $(LDOPTS) $< $(LIBPLC) $(LIBPR) wsock32.lib -out:$@
 
 export:: $(TARGETS)
 
-install:: export
-
 clean::
 	rm -rf $(TARGETS)