зеркало из https://github.com/mozilla/gecko-dev.git
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.
This commit is contained in:
Родитель
f85fc1724b
Коммит
b06b54dd72
|
@ -192,16 +192,14 @@ endif
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
all:: export libs install
|
all:: export
|
||||||
|
|
||||||
export::
|
export::
|
||||||
+$(LOOP_OVER_DIRS)
|
+$(LOOP_OVER_DIRS)
|
||||||
|
|
||||||
libs::
|
libs:: export
|
||||||
+$(LOOP_OVER_DIRS)
|
|
||||||
|
|
||||||
install::
|
install:: export
|
||||||
+$(LOOP_OVER_DIRS)
|
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
rm -rf $(OBJS) so_locations $(NOSUCHFILE) $(GARBAGE)
|
rm -rf $(OBJS) so_locations $(NOSUCHFILE) $(GARBAGE)
|
||||||
|
|
|
@ -45,4 +45,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -50,4 +50,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -188,5 +188,4 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -203,5 +203,4 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -45,4 +45,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -50,4 +50,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -49,5 +49,4 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
|
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -54,5 +54,4 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
|
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -187,4 +187,3 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -201,4 +201,3 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -41,4 +41,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -46,4 +46,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -50,4 +50,3 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
|
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -55,4 +55,3 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
|
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -134,4 +134,3 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -139,4 +139,3 @@ ifeq ($(MOZ_BITS),16)
|
||||||
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -212,4 +212,3 @@ ifdef SHARED_LIBRARY
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -225,4 +225,3 @@ ifdef SHARED_LIBRARY
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -238,7 +238,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -243,7 +243,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -242,7 +242,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -247,7 +247,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -454,4 +454,3 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
|
||||||
rtl_enable -o $@ $<
|
rtl_enable -o $@ $<
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -475,5 +475,4 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
|
||||||
rtl_enable -o $@ $<
|
rtl_enable -o $@ $<
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -51,5 +51,4 @@ DEFINES += -D_NSPR_BUILD_
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -56,5 +56,4 @@ DEFINES += -D_NSPR_BUILD_
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -65,4 +65,3 @@ HEADERS = $(wildcard *.h)
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -69,4 +69,3 @@ HEADERS = $(srcdir)/*.h
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -274,7 +274,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -279,7 +279,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -78,4 +78,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -83,4 +83,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -58,4 +58,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -64,4 +64,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -56,4 +56,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -61,4 +61,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -73,4 +73,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -82,4 +82,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -54,4 +54,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -63,7 +63,6 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,6 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -338,4 +338,3 @@ endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -360,4 +360,3 @@ endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif #!USE_AUTOCONF
|
endif #!USE_AUTOCONF
|
||||||
install:: export
|
|
||||||
|
|
|
@ -100,4 +100,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -109,4 +109,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -60,5 +60,4 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -67,5 +67,4 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -100,5 +100,4 @@ build_prerr:
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -109,5 +109,4 @@ build_prerr:
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -61,5 +61,4 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -67,5 +67,4 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
|
|
|
@ -91,4 +91,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -97,4 +97,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -67,4 +67,3 @@ include $(MOD_DEPTH)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -75,4 +75,3 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
|
@ -528,7 +528,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -554,7 +554,6 @@ endif
|
||||||
endif # !USE_AUTOCONF
|
endif # !USE_AUTOCONF
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,6 @@ ifdef SHARED_LIBRARY
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
$(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll
|
$(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
rm -rf $(TARGETS)
|
rm -rf $(TARGETS)
|
||||||
|
|
|
@ -110,7 +110,6 @@ ifdef SHARED_LIBRARY
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
$(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll
|
$(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
rm -rf $(TARGETS)
|
rm -rf $(TARGETS)
|
||||||
|
|
|
@ -85,7 +85,6 @@ endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
rm -rf $(TARGETS)
|
rm -rf $(TARGETS)
|
||||||
|
|
|
@ -90,7 +90,6 @@ endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
|
|
||||||
install:: export
|
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
rm -rf $(TARGETS)
|
rm -rf $(TARGETS)
|
||||||
|
|
|
@ -235,7 +235,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
|
@ -240,7 +240,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export:: $(TARGETS)
|
export:: $(TARGETS)
|
||||||
install:: export
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(TARGETS)
|
rm -f $(TARGETS)
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче