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.

2001-01-22 06:36:06 +00:00 · 2001-01-22 06:36:06 +00:00 · b06b54dd72
--- a/nsprpub/config/rules.mk
+++ b/nsprpub/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)
--- a/nsprpub/lib/Makefile
+++ b/nsprpub/lib/Makefile
@ -45,4 +45,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/lib/Makefile.in
+++ b/nsprpub/lib/Makefile.in
@ -50,4 +50,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/lib/ds/Makefile
+++ b/nsprpub/lib/ds/Makefile
@ -188,5 +188,4 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif

-install:: export

--- a/nsprpub/lib/ds/Makefile.in
+++ b/nsprpub/lib/ds/Makefile.in
@ -203,5 +203,4 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif

-install:: export

--- a/nsprpub/lib/libc/Makefile
+++ b/nsprpub/lib/libc/Makefile
@ -45,4 +45,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/lib/libc/Makefile.in
+++ b/nsprpub/lib/libc/Makefile.in
@ -50,4 +50,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/lib/libc/include/Makefile
+++ b/nsprpub/lib/libc/include/Makefile
@ -49,5 +49,4 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
 endif

-install:: export

--- a/nsprpub/lib/libc/include/Makefile.in
+++ b/nsprpub/lib/libc/include/Makefile.in
@ -54,5 +54,4 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
 endif

-install:: export

--- a/nsprpub/lib/libc/src/Makefile
+++ b/nsprpub/lib/libc/src/Makefile
@ -187,4 +187,3 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif

-install:: export
--- a/nsprpub/lib/libc/src/Makefile.in
+++ b/nsprpub/lib/libc/src/Makefile.in
@ -201,4 +201,3 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif

-install:: export
--- a/nsprpub/lib/msgc/Makefile
+++ b/nsprpub/lib/msgc/Makefile
@ -41,4 +41,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/lib/msgc/Makefile.in
+++ b/nsprpub/lib/msgc/Makefile.in
@ -46,4 +46,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/lib/msgc/include/Makefile
+++ b/nsprpub/lib/msgc/include/Makefile
@ -50,4 +50,3 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
 endif

-install:: export
--- a/nsprpub/lib/msgc/include/Makefile.in
+++ b/nsprpub/lib/msgc/include/Makefile.in
@ -55,4 +55,3 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
 endif

-install:: export
--- a/nsprpub/lib/msgc/src/Makefile
+++ b/nsprpub/lib/msgc/src/Makefile
@ -134,4 +134,3 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif	

-install:: export
--- a/nsprpub/lib/msgc/src/Makefile.in
+++ b/nsprpub/lib/msgc/src/Makefile.in
@ -139,4 +139,3 @@ ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif	

-install:: export
--- a/nsprpub/lib/prstreams/Makefile
+++ b/nsprpub/lib/prstreams/Makefile
@ -212,4 +212,3 @@ ifdef SHARED_LIBRARY
 endif
 endif

-install:: export
--- a/nsprpub/lib/prstreams/Makefile.in
+++ b/nsprpub/lib/prstreams/Makefile.in
@ -225,4 +225,3 @@ ifdef SHARED_LIBRARY
 endif
 endif

-install:: export
--- a/nsprpub/lib/prstreams/tests/testprstrm/Makefile
+++ b/nsprpub/lib/prstreams/tests/testprstrm/Makefile
@ -238,7 +238,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
+++ b/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
@ -243,7 +243,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/lib/tests/Makefile
+++ b/nsprpub/lib/tests/Makefile
@ -242,7 +242,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/lib/tests/Makefile.in
+++ b/nsprpub/lib/tests/Makefile.in
@ -247,7 +247,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/pr/src/Makefile
+++ b/nsprpub/pr/src/Makefile
@ -454,4 +454,3 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
 	rtl_enable -o $@ $<
 endif

-install:: export
--- a/nsprpub/pr/src/Makefile.in
+++ b/nsprpub/pr/src/Makefile.in
@ -475,5 +475,4 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
 	rtl_enable -o $@ $<
 endif

-install:: export

--- a/nsprpub/pr/src/bthreads/Makefile
+++ b/nsprpub/pr/src/bthreads/Makefile
@ -51,5 +51,4 @@ DEFINES     += -D_NSPR_BUILD_

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/bthreads/Makefile.in
+++ b/nsprpub/pr/src/bthreads/Makefile.in
@ -56,5 +56,4 @@ DEFINES		+= -D_NSPR_BUILD_

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/cplus/Makefile
+++ b/nsprpub/pr/src/cplus/Makefile
@ -65,4 +65,3 @@ HEADERS = $(wildcard *.h)

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/cplus/Makefile.in
+++ b/nsprpub/pr/src/cplus/Makefile.in
@ -69,4 +69,3 @@ HEADERS = $(srcdir)/*.h

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/cplus/tests/Makefile
+++ b/nsprpub/pr/src/cplus/tests/Makefile
@ -274,7 +274,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/pr/src/cplus/tests/Makefile.in
+++ b/nsprpub/pr/src/cplus/tests/Makefile.in
@ -279,7 +279,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/pr/src/io/Makefile
+++ b/nsprpub/pr/src/io/Makefile
@ -78,4 +78,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/io/Makefile.in
+++ b/nsprpub/pr/src/io/Makefile.in
@ -83,4 +83,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/linking/Makefile
+++ b/nsprpub/pr/src/linking/Makefile
@ -58,4 +58,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/linking/Makefile.in
+++ b/nsprpub/pr/src/linking/Makefile.in
@ -64,4 +64,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/malloc/Makefile
+++ b/nsprpub/pr/src/malloc/Makefile
@ -56,4 +56,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/malloc/Makefile.in
+++ b/nsprpub/pr/src/malloc/Makefile.in
@ -61,4 +61,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/md/Makefile
+++ b/nsprpub/pr/src/md/Makefile
@ -73,4 +73,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/md/Makefile.in
+++ b/nsprpub/pr/src/md/Makefile.in
@ -82,4 +82,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/md/beos/Makefile
+++ b/nsprpub/pr/src/md/beos/Makefile
@ -48,4 +48,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/md/beos/Makefile.in
+++ b/nsprpub/pr/src/md/beos/Makefile.in
@ -54,4 +54,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/md/os2/Makefile
+++ b/nsprpub/pr/src/md/os2/Makefile
@ -63,7 +63,6 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export



--- a/nsprpub/pr/src/md/os2/Makefile.in
+++ b/nsprpub/pr/src/md/os2/Makefile.in
@ -68,7 +68,6 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export



--- a/nsprpub/pr/src/md/unix/Makefile
+++ b/nsprpub/pr/src/md/unix/Makefile
@ -338,4 +338,3 @@ endif
 endif
 endif

-install:: export
--- a/nsprpub/pr/src/md/unix/Makefile.in
+++ b/nsprpub/pr/src/md/unix/Makefile.in
@ -360,4 +360,3 @@ endif
 endif
 endif
 endif #!USE_AUTOCONF
-install:: export
--- a/nsprpub/pr/src/md/windows/Makefile
+++ b/nsprpub/pr/src/md/windows/Makefile
@ -100,4 +100,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/md/windows/Makefile.in
+++ b/nsprpub/pr/src/md/windows/Makefile.in
@ -109,4 +109,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/memory/Makefile
+++ b/nsprpub/pr/src/memory/Makefile
@ -60,5 +60,4 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/memory/Makefile.in
+++ b/nsprpub/pr/src/memory/Makefile.in
@ -67,5 +67,4 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/misc/Makefile
+++ b/nsprpub/pr/src/misc/Makefile
@ -100,5 +100,4 @@ build_prerr:

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/misc/Makefile.in
+++ b/nsprpub/pr/src/misc/Makefile.in
@ -109,5 +109,4 @@ build_prerr:

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/pthreads/Makefile
+++ b/nsprpub/pr/src/pthreads/Makefile
@ -61,5 +61,4 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/pthreads/Makefile.in
+++ b/nsprpub/pr/src/pthreads/Makefile.in
@ -67,5 +67,4 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export

--- a/nsprpub/pr/src/threads/Makefile
+++ b/nsprpub/pr/src/threads/Makefile
@ -91,4 +91,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/threads/Makefile.in
+++ b/nsprpub/pr/src/threads/Makefile.in
@ -97,4 +97,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/threads/combined/Makefile
+++ b/nsprpub/pr/src/threads/combined/Makefile
@ -67,4 +67,3 @@ include $(MOD_DEPTH)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/src/threads/combined/Makefile.in
+++ b/nsprpub/pr/src/threads/combined/Makefile.in
@ -75,4 +75,3 @@ include $(topsrcdir)/config/rules.mk

 export:: $(TARGETS)

-install:: export
--- a/nsprpub/pr/tests/Makefile
+++ b/nsprpub/pr/tests/Makefile
@ -528,7 +528,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/pr/tests/Makefile.in
+++ b/nsprpub/pr/tests/Makefile.in
@ -554,7 +554,6 @@ endif
 endif # !USE_AUTOCONF

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/pr/tests/dll/Makefile
+++ b/nsprpub/pr/tests/dll/Makefile
@ -105,7 +105,6 @@ ifdef SHARED_LIBRARY
 export:: $(TARGETS)
 	$(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll

-install:: export

 clean::
 	rm -rf $(TARGETS)
--- a/nsprpub/pr/tests/dll/Makefile.in
+++ b/nsprpub/pr/tests/dll/Makefile.in
@ -110,7 +110,6 @@ ifdef SHARED_LIBRARY
 export:: $(TARGETS)
 	$(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll

-install:: export

 clean::
 	rm -rf $(TARGETS)
--- a/nsprpub/pr/tests/w16gui/Makefile
+++ b/nsprpub/pr/tests/w16gui/Makefile
@ -85,7 +85,6 @@ endif

 export:: $(TARGETS)

-install:: export

 clean::
 	rm -rf $(TARGETS)
--- a/nsprpub/pr/tests/w16gui/Makefile.in
+++ b/nsprpub/pr/tests/w16gui/Makefile.in
@ -90,7 +90,6 @@ endif

 export:: $(TARGETS)

-install:: export

 clean::
 	rm -rf $(TARGETS)
--- a/nsprpub/tools/Makefile
+++ b/nsprpub/tools/Makefile
@ -235,7 +235,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)

--- a/nsprpub/tools/Makefile.in
+++ b/nsprpub/tools/Makefile.in
@ -240,7 +240,6 @@ endif
 endif

 export:: $(TARGETS)
-install:: export
 clean::
 	rm -f $(TARGETS)