diff options
author | cls%seawood.org <devnull@localhost> | 2001-01-22 06:36:06 +0000 |
---|---|---|
committer | cls%seawood.org <devnull@localhost> | 2001-01-22 06:36:06 +0000 |
commit | 3b8d7b60ae4e62b9c180521c7f6ce411f43354f8 (patch) | |
tree | db2393d935048f985c1f9ff7bfe8b2feceb3597a | |
parent | d436afb85d7aa03cceeaff7dabddbf02bd368a93 (diff) | |
download | nspr-hg-3b8d7b60ae4e62b9c180521c7f6ce411f43354f8.tar.gz |
There is no need to invoke recursive makes for the dummy libs & install phases of nspr. Especially when it means having a dummy target in every makefile that has a dependency upon export. Instead, put the dummy target in rules.mk.
65 files changed, 3 insertions, 69 deletions
diff --git a/config/rules.mk b/config/rules.mk index 87bff335..27009222 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -192,16 +192,14 @@ endif ################################################################################ -all:: export libs install +all:: export export:: +$(LOOP_OVER_DIRS) -libs:: - +$(LOOP_OVER_DIRS) +libs:: export -install:: - +$(LOOP_OVER_DIRS) +install:: export clean:: rm -rf $(OBJS) so_locations $(NOSUCHFILE) $(GARBAGE) diff --git a/lib/Makefile b/lib/Makefile index 27d3c22b..054d844c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -45,4 +45,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/lib/Makefile.in b/lib/Makefile.in index 8f5bb39f..1edcf1f0 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -50,4 +50,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/lib/ds/Makefile b/lib/ds/Makefile index 6a4d679a..1ec9808c 100644 --- a/lib/ds/Makefile +++ b/lib/ds/Makefile @@ -188,5 +188,4 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in index a011a4c2..b223d774 100644 --- a/lib/ds/Makefile.in +++ b/lib/ds/Makefile.in @@ -203,5 +203,4 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export diff --git a/lib/libc/Makefile b/lib/libc/Makefile index db41b3a2..8a8fd46e 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -45,4 +45,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/lib/libc/Makefile.in b/lib/libc/Makefile.in index 6704a9af..778cc96d 100644 --- a/lib/libc/Makefile.in +++ b/lib/libc/Makefile.in @@ -50,4 +50,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/lib/libc/include/Makefile b/lib/libc/include/Makefile index 866a6b02..d4275801 100644 --- a/lib/libc/include/Makefile +++ b/lib/libc/include/Makefile @@ -49,5 +49,4 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL) endif -install:: export diff --git a/lib/libc/include/Makefile.in b/lib/libc/include/Makefile.in index e753b386..7bfe7408 100644 --- a/lib/libc/include/Makefile.in +++ b/lib/libc/include/Makefile.in @@ -54,5 +54,4 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL) endif -install:: export diff --git a/lib/libc/src/Makefile b/lib/libc/src/Makefile index edd6d884..600317fd 100644 --- a/lib/libc/src/Makefile +++ b/lib/libc/src/Makefile @@ -187,4 +187,3 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in index c0919b41..3f22cf27 100644 --- a/lib/libc/src/Makefile.in +++ b/lib/libc/src/Makefile.in @@ -201,4 +201,3 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export diff --git a/lib/msgc/Makefile b/lib/msgc/Makefile index a6931cdf..1bb77bc9 100644 --- a/lib/msgc/Makefile +++ b/lib/msgc/Makefile @@ -41,4 +41,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/lib/msgc/Makefile.in b/lib/msgc/Makefile.in index 35c702b7..91938916 100644 --- a/lib/msgc/Makefile.in +++ b/lib/msgc/Makefile.in @@ -46,4 +46,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/lib/msgc/include/Makefile b/lib/msgc/include/Makefile index cf571ff2..03b44f56 100644 --- a/lib/msgc/include/Makefile +++ b/lib/msgc/include/Makefile @@ -50,4 +50,3 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL) endif -install:: export diff --git a/lib/msgc/include/Makefile.in b/lib/msgc/include/Makefile.in index 344b9c95..020d6dc7 100644 --- a/lib/msgc/include/Makefile.in +++ b/lib/msgc/include/Makefile.in @@ -55,4 +55,3 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL) endif -install:: export diff --git a/lib/msgc/src/Makefile b/lib/msgc/src/Makefile index 7db7d679..18da3203 100644 --- a/lib/msgc/src/Makefile +++ b/lib/msgc/src/Makefile @@ -134,4 +134,3 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in index eff3b2c2..51a565c5 100644 --- a/lib/msgc/src/Makefile.in +++ b/lib/msgc/src/Makefile.in @@ -139,4 +139,3 @@ ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin endif -install:: export diff --git a/lib/prstreams/Makefile b/lib/prstreams/Makefile index b26daba5..ac1171f3 100644 --- a/lib/prstreams/Makefile +++ b/lib/prstreams/Makefile @@ -212,4 +212,3 @@ ifdef SHARED_LIBRARY endif endif -install:: export diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in index ef6c4fb7..7bfff242 100644 --- a/lib/prstreams/Makefile.in +++ b/lib/prstreams/Makefile.in @@ -225,4 +225,3 @@ ifdef SHARED_LIBRARY endif endif -install:: export diff --git a/lib/prstreams/tests/testprstrm/Makefile b/lib/prstreams/tests/testprstrm/Makefile index 75927a11..2a7fe87e 100644 --- a/lib/prstreams/tests/testprstrm/Makefile +++ b/lib/prstreams/tests/testprstrm/Makefile @@ -238,7 +238,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/lib/prstreams/tests/testprstrm/Makefile.in b/lib/prstreams/tests/testprstrm/Makefile.in index 30119b34..79285a39 100644 --- a/lib/prstreams/tests/testprstrm/Makefile.in +++ b/lib/prstreams/tests/testprstrm/Makefile.in @@ -243,7 +243,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/lib/tests/Makefile b/lib/tests/Makefile index 288b0b6a..18495367 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -242,7 +242,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 29188e71..974e6639 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -247,7 +247,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/pr/src/Makefile b/pr/src/Makefile index 1ec6195c..fbac9ee7 100644 --- a/pr/src/Makefile +++ b/pr/src/Makefile @@ -454,4 +454,3 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a rtl_enable -o $@ $< endif -install:: export diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 45278134..ea634b71 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -475,5 +475,4 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a rtl_enable -o $@ $< endif -install:: export diff --git a/pr/src/bthreads/Makefile b/pr/src/bthreads/Makefile index 14dbcc28..9649cf72 100644 --- a/pr/src/bthreads/Makefile +++ b/pr/src/bthreads/Makefile @@ -51,5 +51,4 @@ DEFINES += -D_NSPR_BUILD_ export:: $(TARGETS) -install:: export diff --git a/pr/src/bthreads/Makefile.in b/pr/src/bthreads/Makefile.in index b9e24342..994f46d3 100644 --- a/pr/src/bthreads/Makefile.in +++ b/pr/src/bthreads/Makefile.in @@ -56,5 +56,4 @@ DEFINES += -D_NSPR_BUILD_ export:: $(TARGETS) -install:: export diff --git a/pr/src/cplus/Makefile b/pr/src/cplus/Makefile index b874f2a8..48d21d76 100644 --- a/pr/src/cplus/Makefile +++ b/pr/src/cplus/Makefile @@ -65,4 +65,3 @@ HEADERS = $(wildcard *.h) export:: $(TARGETS) -install:: export diff --git a/pr/src/cplus/Makefile.in b/pr/src/cplus/Makefile.in index a5a8586f..35b7521c 100644 --- a/pr/src/cplus/Makefile.in +++ b/pr/src/cplus/Makefile.in @@ -69,4 +69,3 @@ HEADERS = $(srcdir)/*.h export:: $(TARGETS) -install:: export diff --git a/pr/src/cplus/tests/Makefile b/pr/src/cplus/tests/Makefile index 35161bee..fef4103a 100644 --- a/pr/src/cplus/tests/Makefile +++ b/pr/src/cplus/tests/Makefile @@ -274,7 +274,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/pr/src/cplus/tests/Makefile.in b/pr/src/cplus/tests/Makefile.in index ef848677..01db2230 100644 --- a/pr/src/cplus/tests/Makefile.in +++ b/pr/src/cplus/tests/Makefile.in @@ -279,7 +279,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/pr/src/io/Makefile b/pr/src/io/Makefile index b911835e..04ab8f03 100644 --- a/pr/src/io/Makefile +++ b/pr/src/io/Makefile @@ -78,4 +78,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/io/Makefile.in b/pr/src/io/Makefile.in index 6e450286..2cb2b694 100644 --- a/pr/src/io/Makefile.in +++ b/pr/src/io/Makefile.in @@ -83,4 +83,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/linking/Makefile b/pr/src/linking/Makefile index 97484223..60753f2e 100644 --- a/pr/src/linking/Makefile +++ b/pr/src/linking/Makefile @@ -58,4 +58,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/linking/Makefile.in b/pr/src/linking/Makefile.in index 79da9850..6e51a26e 100644 --- a/pr/src/linking/Makefile.in +++ b/pr/src/linking/Makefile.in @@ -64,4 +64,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/malloc/Makefile b/pr/src/malloc/Makefile index 6dffc690..677d6b1c 100644 --- a/pr/src/malloc/Makefile +++ b/pr/src/malloc/Makefile @@ -56,4 +56,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/malloc/Makefile.in b/pr/src/malloc/Makefile.in index 8f90ca9f..fb0d66c1 100644 --- a/pr/src/malloc/Makefile.in +++ b/pr/src/malloc/Makefile.in @@ -61,4 +61,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/Makefile b/pr/src/md/Makefile index 5ab37620..dec5c792 100644 --- a/pr/src/md/Makefile +++ b/pr/src/md/Makefile @@ -73,4 +73,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/Makefile.in b/pr/src/md/Makefile.in index b1f19c0f..c4a2669b 100644 --- a/pr/src/md/Makefile.in +++ b/pr/src/md/Makefile.in @@ -82,4 +82,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/beos/Makefile b/pr/src/md/beos/Makefile index 380fb370..6ae7bd54 100644 --- a/pr/src/md/beos/Makefile +++ b/pr/src/md/beos/Makefile @@ -48,4 +48,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/beos/Makefile.in b/pr/src/md/beos/Makefile.in index e15846e9..d2e70f48 100644 --- a/pr/src/md/beos/Makefile.in +++ b/pr/src/md/beos/Makefile.in @@ -54,4 +54,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/os2/Makefile b/pr/src/md/os2/Makefile index 2bc99a0f..4d529268 100644 --- a/pr/src/md/os2/Makefile +++ b/pr/src/md/os2/Makefile @@ -63,7 +63,6 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/os2/Makefile.in b/pr/src/md/os2/Makefile.in index 28d0cad9..b9621a05 100644 --- a/pr/src/md/os2/Makefile.in +++ b/pr/src/md/os2/Makefile.in @@ -68,7 +68,6 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/unix/Makefile b/pr/src/md/unix/Makefile index 40481474..a6af40ce 100644 --- a/pr/src/md/unix/Makefile +++ b/pr/src/md/unix/Makefile @@ -338,4 +338,3 @@ endif endif endif -install:: export diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index e4aee01a..177e3975 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -360,4 +360,3 @@ endif endif endif endif #!USE_AUTOCONF -install:: export diff --git a/pr/src/md/windows/Makefile b/pr/src/md/windows/Makefile index 140c62f1..36412de3 100644 --- a/pr/src/md/windows/Makefile +++ b/pr/src/md/windows/Makefile @@ -100,4 +100,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/md/windows/Makefile.in b/pr/src/md/windows/Makefile.in index c569a168..b1fca6ce 100644 --- a/pr/src/md/windows/Makefile.in +++ b/pr/src/md/windows/Makefile.in @@ -109,4 +109,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/memory/Makefile b/pr/src/memory/Makefile index 807b582c..e3e15a79 100644 --- a/pr/src/memory/Makefile +++ b/pr/src/memory/Makefile @@ -60,5 +60,4 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/memory/Makefile.in b/pr/src/memory/Makefile.in index 0133f368..55d4f3e5 100644 --- a/pr/src/memory/Makefile.in +++ b/pr/src/memory/Makefile.in @@ -67,5 +67,4 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/misc/Makefile b/pr/src/misc/Makefile index 567b14cf..14210b82 100644 --- a/pr/src/misc/Makefile +++ b/pr/src/misc/Makefile @@ -100,5 +100,4 @@ build_prerr: export:: $(TARGETS) -install:: export diff --git a/pr/src/misc/Makefile.in b/pr/src/misc/Makefile.in index 0ec66850..0e018c1f 100644 --- a/pr/src/misc/Makefile.in +++ b/pr/src/misc/Makefile.in @@ -109,5 +109,4 @@ build_prerr: export:: $(TARGETS) -install:: export diff --git a/pr/src/pthreads/Makefile b/pr/src/pthreads/Makefile index cb99d94d..3790758e 100644 --- a/pr/src/pthreads/Makefile +++ b/pr/src/pthreads/Makefile @@ -61,5 +61,4 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/pthreads/Makefile.in b/pr/src/pthreads/Makefile.in index c18b3c04..d1033437 100644 --- a/pr/src/pthreads/Makefile.in +++ b/pr/src/pthreads/Makefile.in @@ -67,5 +67,4 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/threads/Makefile b/pr/src/threads/Makefile index f495470c..98a6e5e8 100644 --- a/pr/src/threads/Makefile +++ b/pr/src/threads/Makefile @@ -91,4 +91,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/threads/Makefile.in b/pr/src/threads/Makefile.in index 69a4b76b..9ae2dad4 100644 --- a/pr/src/threads/Makefile.in +++ b/pr/src/threads/Makefile.in @@ -97,4 +97,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/threads/combined/Makefile b/pr/src/threads/combined/Makefile index 98d6020f..affd8bc0 100644 --- a/pr/src/threads/combined/Makefile +++ b/pr/src/threads/combined/Makefile @@ -67,4 +67,3 @@ include $(MOD_DEPTH)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/src/threads/combined/Makefile.in b/pr/src/threads/combined/Makefile.in index 043350cc..f42a3a21 100644 --- a/pr/src/threads/combined/Makefile.in +++ b/pr/src/threads/combined/Makefile.in @@ -75,4 +75,3 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -install:: export diff --git a/pr/tests/Makefile b/pr/tests/Makefile index c544bb65..60a0cbf6 100644 --- a/pr/tests/Makefile +++ b/pr/tests/Makefile @@ -528,7 +528,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index 41bb1808..6365b539 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -554,7 +554,6 @@ endif endif # !USE_AUTOCONF export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/pr/tests/dll/Makefile b/pr/tests/dll/Makefile index 820a5516..cd80ebcd 100644 --- a/pr/tests/dll/Makefile +++ b/pr/tests/dll/Makefile @@ -105,7 +105,6 @@ ifdef SHARED_LIBRARY export:: $(TARGETS) $(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll -install:: export clean:: rm -rf $(TARGETS) diff --git a/pr/tests/dll/Makefile.in b/pr/tests/dll/Makefile.in index 671a9449..d73510e4 100644 --- a/pr/tests/dll/Makefile.in +++ b/pr/tests/dll/Makefile.in @@ -110,7 +110,6 @@ ifdef SHARED_LIBRARY export:: $(TARGETS) $(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll -install:: export clean:: rm -rf $(TARGETS) diff --git a/pr/tests/w16gui/Makefile b/pr/tests/w16gui/Makefile index 306eb3c4..5e5c4691 100644 --- a/pr/tests/w16gui/Makefile +++ b/pr/tests/w16gui/Makefile @@ -85,7 +85,6 @@ endif export:: $(TARGETS) -install:: export clean:: rm -rf $(TARGETS) diff --git a/pr/tests/w16gui/Makefile.in b/pr/tests/w16gui/Makefile.in index ba9f572d..0620bcbb 100644 --- a/pr/tests/w16gui/Makefile.in +++ b/pr/tests/w16gui/Makefile.in @@ -90,7 +90,6 @@ endif export:: $(TARGETS) -install:: export clean:: rm -rf $(TARGETS) diff --git a/tools/Makefile b/tools/Makefile index f036a4cb..13b088d4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -235,7 +235,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) diff --git a/tools/Makefile.in b/tools/Makefile.in index 7a9ffd54..4eedcd79 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -240,7 +240,6 @@ endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) |