Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix header export rules for parallel builds.

Browse Source 
Bug #319460 r=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@185994 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org 2005-12-13 17:25:26 +00:00
parent fb3979418e
commit acb2af0480
3 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
mozilla/config/rules.mk
View File

@ -700,17 +700,15 @@ install:: $(SUBMAKEFILES) $(MAKE_DIRS)
+$(LOOP_OVER_DIRS) +$(LOOP_OVER_DIRS)
+$(LOOP_OVER_TOOL_DIRS) +$(LOOP_OVER_TOOL_DIRS)
install:: $(EXPORTS)
ifndef NO_INSTALL ifndef NO_INSTALL
ifdef EXPORTS ifneq (,$(EXPORTS))
install:: $(EXPORTS)
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
endif endif
endif
ifneq (,$(SDK_HEADERS))
install:: $(SDK_HEADERS) install:: $(SDK_HEADERS)
ifndef NO_INSTALL $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
ifdef SDK_HEADERS
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)
endif endif
endif endif
@ -1204,22 +1202,20 @@ export::
@if test ! -d $(FINAL_TARGET); then echo Creating $(FINAL_TARGET); rm -fr $(FINAL_TARGET); $(NSINSTALL) -D $(FINAL_TARGET); else true; fi @if test ! -d $(FINAL_TARGET); then echo Creating $(FINAL_TARGET); rm -fr $(FINAL_TARGET); $(NSINSTALL) -D $(FINAL_TARGET); else true; fi
endif endif
ifneq ($(EXPORTS),)
ifndef NO_DIST_INSTALL ifndef NO_DIST_INSTALL
ifneq ($(EXPORTS),)
export:: $(EXPORTS) $(PUBLIC) export:: $(EXPORTS) $(PUBLIC)
$(INSTALL) $(IFLAGS1) $^ $(INSTALL) $(IFLAGS1) $^
endif # NO_DIST_INSTALL
endif endif
ifneq ($(SDK_HEADERS),) ifneq ($(SDK_HEADERS),)
ifndef NO_DIST_INSTALL export:: $(SDK_HEADERS) $(SDK_PUBLIC)
export:: $(PUBLIC) $(SDK_PUBLIC) $(INSTALL) $(IFLAGS1) $^
export:: $(SDK_HEADERS) export:: $(SDK_HEADERS) $(PUBLIC)
$(INSTALL) $(IFLAGS1) $^ $(PUBLIC) $(INSTALL) $(IFLAGS1) $^
$(INSTALL) $(IFLAGS1) $^ $(SDK_PUBLIC)
endif # NO_DIST_INSTALL
endif endif
endif # NO_DIST_INSTALL
################################################################################ ################################################################################
# Copy each element of PREF_JS_EXPORTS # Copy each element of PREF_JS_EXPORTS
@ -1347,27 +1343,21 @@ GARBAGE_DIRS += $(XPIDL_GEN_DIR)
endif # XPIDLSRCS || SDK_XPIDLSRCS endif # XPIDLSRCS || SDK_XPIDLSRCS
ifneq ($(XPIDLSRCS),) ifneq ($(XPIDLSRCS),)
ifndef NO_DIST_INSTALL
# export .idl files to $(IDL_DIR) # export .idl files to $(IDL_DIR)
ifndef NO_DIST_INSTALL
export:: $(XPIDLSRCS) $(IDL_DIR) export:: $(XPIDLSRCS) $(IDL_DIR)
$(INSTALL) $(IFLAGS1) $^ $(INSTALL) $(IFLAGS1) $^
export:: $(PUBLIC) export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(PUBLIC)
endif $(INSTALL) $(IFLAGS1) $^
export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
ifndef NO_DIST_INSTALL
$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
endif # NO_DIST_INSTALL endif # NO_DIST_INSTALL
install:: $(XPIDLSRCS)
ifndef NO_INSTALL ifndef NO_INSTALL
install:: $(XPIDLSRCS)
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir)
endif
install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
ifndef NO_INSTALL
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
endif endif
@ -1402,27 +1392,25 @@ endif
ifneq ($(SDK_XPIDLSRCS),) ifneq ($(SDK_XPIDLSRCS),)
# export .idl files to $(IDL_DIR) & $(SDK_IDL_DIR) # export .idl files to $(IDL_DIR) & $(SDK_IDL_DIR)
ifndef NO_DIST_INSTALL ifndef NO_DIST_INSTALL
export:: $(IDL_DIR) $(SDK_IDL_DIR) $(PUBLIC) $(SDK_PUBLIC) export:: $(SDK_XPIDLSRCS) $(IDL_DIR)
$(INSTALL) $(IFLAGS1) $^
export:: $(SDK_XPIDLSRCS) export:: $(SDK_XPIDLSRCS) $(SDK_IDL_DIR)
$(INSTALL) $(IFLAGS1) $^ $(IDL_DIR) $(INSTALL) $(IFLAGS1) $^
$(INSTALL) $(IFLAGS1) $^ $(SDK_IDL_DIR)
endif # NO_DIST_INSTALL
export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS)) export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS)) $(PUBLIC)
ifndef NO_DIST_INSTALL $(INSTALL) $(IFLAGS1) $^
$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
$(INSTALL) $(IFLAGS1) $^ $(SDK_PUBLIC) export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS)) $(SDK_PUBLIC)
$(INSTALL) $(IFLAGS1) $^
endif endif
install:: $(SDK_XPIDLSRCS)
ifndef NO_INSTALL ifndef NO_INSTALL
install:: $(SDK_XPIDLSRCS)
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir)
endif
install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS)) install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS))
ifndef NO_INSTALL $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)
endif endif
endif # SDK_XPIDLSRCS endif # SDK_XPIDLSRCS

4
mozilla/modules/plugin/base/public/Makefile.in
View File

@ -53,10 +53,6 @@ EXPORTS = \
nsDefaultPlugin.h \ nsDefaultPlugin.h \
nsPluginNativeWindow.h \ nsPluginNativeWindow.h \
nsPluginsCID.h \ nsPluginsCID.h \
npapi.h \
npupp.h \
npruntime.h \
nptypes.h \
nsIPluginInstanceInternal.h \ nsIPluginInstanceInternal.h \
$(NULL) $(NULL)

5
mozilla/sun-java/stubs/include/Makefile.in
View File

@ -42,12 +42,7 @@ EXPORTS = \
javaString.h \ javaString.h \
javaThreads.h \ javaThreads.h \
jmc.h \ jmc.h \
jni.h \
jni_md.h \
jri.h \
jri_md.h \
jriext.h \ jriext.h \
jritypes.h \
nspr_md.h \ nspr_md.h \
oobj.h \ oobj.h \
sysmacros_md.h \ sysmacros_md.h \