diff options
| author | cls%seawood.org <devnull@localhost> | 2005-11-23 06:30:33 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 2005-11-23 06:30:33 +0000 |
| commit | 5300e6b85fda3389a09dbcdd54bd7239fa82bc6f (patch) | |
| tree | 83f20756776ad4d0667c92fed32c3bea0ef92975 | |
| parent | 402800b8dd4ca7bf7104bfe103b602ecc4f79b2e (diff) | |
| download | nspr-hg-5300e6b85fda3389a09dbcdd54bd7239fa82bc6f.tar.gz | |
Rename real_install target as install.
Thanks to Wan-Teh Chang <wtchang@redhat.com> for the patch.
Bug #304239 r=cls
| -rw-r--r-- | config/Makefile.in | 2 | ||||
| -rw-r--r-- | config/rules.mk | 18 | ||||
| -rw-r--r-- | lib/msgc/tests/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/tests/windows/makefile | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index 890f8c6b..cbed0d6a 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -155,6 +155,6 @@ 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 diff --git a/config/rules.mk b/config/rules.mk index 492e0aeb..b0db541d 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -37,16 +37,18 @@ # ***** END LICENSE BLOCK ***** ################################################################################ -# We have a 4 pass build process: +# We used to have a 4 pass build process. Now we do everything in one pass. # -# Pass 1. export - Create generated headers and stubs. Publish public headers to -# dist/<arch>/include. +# export - Create generated headers and stubs. Publish public headers to +# dist/<arch>/include. +# Create libraries. Publish libraries to dist/<arch>/lib. +# Create programs. # -# Pass 2. libs - Create libraries. Publish libraries to dist/<arch>/lib. +# libs - obsolete. Now a synonym of "export". # -# Pass 3. all - Create programs. +# all - the default makefile target. Now a synonym of "export". # -# Pass 4. install - Publish programs to dist/<arch>/bin. +# install - Install headers, libraries, and programs on the system. # # Parameters to this makefile (set these before including): # @@ -205,8 +207,6 @@ export:: libs:: export -install:: export - clean:: rm -rf $(OBJS) $(RES) so_locations $(NOSUCHFILE) $(GARBAGE) +$(LOOP_OVER_DIRS) @@ -223,7 +223,7 @@ 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 diff --git a/lib/msgc/tests/Makefile.in b/lib/msgc/tests/Makefile.in index 609bdf6b..b447f768 100644 --- a/lib/msgc/tests/Makefile.in +++ b/lib/msgc/tests/Makefile.in @@ -310,6 +310,5 @@ endif endif export:: $(TARGETS) -export:: install clean:: rm -f $(TARGETS) diff --git a/lib/tests/windows/makefile b/lib/tests/windows/makefile index 5441da0a..32b9e30a 100644 --- a/lib/tests/windows/makefile +++ b/lib/tests/windows/makefile @@ -80,7 +80,5 @@ $(OBJDIR)/winevent.exe: $(OBJS) export:: $(TARGETS) -install:: export - clean:: rm -rf $(TARGETS) |