From acb2af04804d6efd0b69f51316eaf29ddf6eae4c Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 13 Dec 2005 17:25:26 +0000
Subject: [PATCH] Fix header export rules for parallel builds. Bug #319460
 r=bsmedberg

git-svn-id: svn://10.0.0.236/trunk@185994 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/rules.mk                       | 62 ++++++++-----------
 .../modules/plugin/base/public/Makefile.in    |  4 --
 mozilla/sun-java/stubs/include/Makefile.in    |  5 --
 3 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index 72823847a13..125e0355f6e 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -700,17 +700,15 @@ install:: $(SUBMAKEFILES) $(MAKE_DIRS)
 	+$(LOOP_OVER_DIRS)
 	+$(LOOP_OVER_TOOL_DIRS)
 
-install:: $(EXPORTS)
 ifndef NO_INSTALL
-ifdef EXPORTS
+ifneq (,$(EXPORTS))
+install:: $(EXPORTS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
 endif
-endif
 
+ifneq (,$(SDK_HEADERS))
 install:: $(SDK_HEADERS)
-ifndef NO_INSTALL
-ifdef SDK_HEADERS
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
 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
 endif
 
-ifneq ($(EXPORTS),)
 ifndef NO_DIST_INSTALL
+ifneq ($(EXPORTS),)
 export:: $(EXPORTS) $(PUBLIC)
 	$(INSTALL) $(IFLAGS1) $^
-endif # NO_DIST_INSTALL
 endif 
 
 ifneq ($(SDK_HEADERS),)
-ifndef NO_DIST_INSTALL
-export:: $(PUBLIC) $(SDK_PUBLIC)
+export:: $(SDK_HEADERS) $(SDK_PUBLIC)
+	$(INSTALL) $(IFLAGS1) $^
 
-export:: $(SDK_HEADERS) 
-	$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
-	$(INSTALL) $(IFLAGS1) $^ $(SDK_PUBLIC)
-endif # NO_DIST_INSTALL
+export:: $(SDK_HEADERS) $(PUBLIC)
+	$(INSTALL) $(IFLAGS1) $^
 endif 
+endif # NO_DIST_INSTALL
 
 ################################################################################
 # Copy each element of PREF_JS_EXPORTS
@@ -1347,27 +1343,21 @@ GARBAGE_DIRS		+= $(XPIDL_GEN_DIR)
 endif # XPIDLSRCS || SDK_XPIDLSRCS
 
 ifneq ($(XPIDLSRCS),)
-ifndef NO_DIST_INSTALL
 # export .idl files to $(IDL_DIR)
+ifndef NO_DIST_INSTALL
 export:: $(XPIDLSRCS) $(IDL_DIR)
 	$(INSTALL) $(IFLAGS1) $^
 
-export:: $(PUBLIC)
-endif
-
-export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) 
-ifndef NO_DIST_INSTALL
-	$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
+export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(PUBLIC)
+	$(INSTALL) $(IFLAGS1) $^ 
 endif # NO_DIST_INSTALL
 
 
-install:: $(XPIDLSRCS)
 ifndef NO_INSTALL
+install:: $(XPIDLSRCS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir)
-endif
 
 install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
-ifndef NO_INSTALL
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
 endif
 
@@ -1402,27 +1392,25 @@ endif
 ifneq ($(SDK_XPIDLSRCS),)
 # export .idl files to $(IDL_DIR) & $(SDK_IDL_DIR)
 ifndef NO_DIST_INSTALL
-export:: $(IDL_DIR) $(SDK_IDL_DIR) $(PUBLIC) $(SDK_PUBLIC)
+export:: $(SDK_XPIDLSRCS) $(IDL_DIR)
+	$(INSTALL) $(IFLAGS1) $^
 
-export:: $(SDK_XPIDLSRCS)
-	$(INSTALL) $(IFLAGS1) $^ $(IDL_DIR)
-	$(INSTALL) $(IFLAGS1) $^ $(SDK_IDL_DIR)
-endif # NO_DIST_INSTALL
+export:: $(SDK_XPIDLSRCS) $(SDK_IDL_DIR)
+	$(INSTALL) $(IFLAGS1) $^
 
-export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS))
-ifndef NO_DIST_INSTALL
-	$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
-	$(INSTALL) $(IFLAGS1) $^ $(SDK_PUBLIC)
+export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS)) $(PUBLIC)
+	$(INSTALL) $(IFLAGS1) $^
+
+export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS)) $(SDK_PUBLIC)
+	$(INSTALL) $(IFLAGS1) $^
 endif
 
-install:: $(SDK_XPIDLSRCS)
 ifndef NO_INSTALL
+install:: $(SDK_XPIDLSRCS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir)
-endif
 
 install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS))
-ifndef NO_INSTALL
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
 endif
 
 endif # SDK_XPIDLSRCS
diff --git a/mozilla/modules/plugin/base/public/Makefile.in b/mozilla/modules/plugin/base/public/Makefile.in
index 335f66142f4..38cf438c384 100644
--- a/mozilla/modules/plugin/base/public/Makefile.in
+++ b/mozilla/modules/plugin/base/public/Makefile.in
@@ -53,10 +53,6 @@ EXPORTS		= \
 		nsDefaultPlugin.h \
 		nsPluginNativeWindow.h \
 		nsPluginsCID.h \
-		npapi.h \
-		npupp.h \
-		npruntime.h \
-		nptypes.h \
 		nsIPluginInstanceInternal.h \
 		$(NULL)
 
diff --git a/mozilla/sun-java/stubs/include/Makefile.in b/mozilla/sun-java/stubs/include/Makefile.in
index 1d6cd5eee2a..6e09454b01c 100644
--- a/mozilla/sun-java/stubs/include/Makefile.in
+++ b/mozilla/sun-java/stubs/include/Makefile.in
@@ -42,12 +42,7 @@ EXPORTS		= \
 		javaString.h \
 		javaThreads.h \
 		jmc.h \
-		jni.h \
-		jni_md.h \
-		jri.h \
-		jri_md.h \
 		jriext.h \
-		jritypes.h \
 		nspr_md.h \
 		oobj.h \
 		sysmacros_md.h \