From 2500e5d7b7eee7997f6671ec60ccbdeb4728ed61 Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 31 Mar 1999 04:54:42 +0000
Subject: [PATCH] landed HPUX patch from Kartik Subbarao
 <subbarao@computer.org>

git-svn-id: svn://10.0.0.236/trunk@25669 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/dom/src/build/Makefile.in    | 14 ++++++++++++++
 mozilla/rdf/brprof/build/Makefile.in | 20 +++++++++++++++++---
 mozilla/rdf/build/Makefile.in        | 20 +++++++++++++++++---
 mozilla/widget/src/build/Makefile.in | 14 ++++++++++++++
 4 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in
index d3d24f941e4..82a71f5b403 100644
--- a/mozilla/dom/src/build/Makefile.in
+++ b/mozilla/dom/src/build/Makefile.in
@@ -52,12 +52,26 @@ SHARED_LIBRARY_LIBS =		       \
 	$(DIST)/lib/libjsdomcss_s.a    \
 	$(NULL)
 
+ifeq ($(OS_ARCH),HP-UX)
+EXTRA_DSO_LDOPTS = -c objs/objslist
+else
 EXTRA_DSO_LDOPTS =	       \
 	$(MKSHLIB_FORCE_ALL)   \
 	$(SHARED_LIBRARY_LIBS) \
 	$(MKSHLIB_UNFORCE_ALL) \
 	$(NULL)
+endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),HP-UX)
+shared_library_objs: $(SHARED_LIBRARY_LIBS)
+	rm -rf objs
+	mkdir objs
+	(cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \
+	| awk '{ print "objs/"$$3 }' > objs/objslist
+
+$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile
+else
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+endif
diff --git a/mozilla/rdf/brprof/build/Makefile.in b/mozilla/rdf/brprof/build/Makefile.in
index a586dd38265..8bd93fa3d4f 100644
--- a/mozilla/rdf/brprof/build/Makefile.in
+++ b/mozilla/rdf/brprof/build/Makefile.in
@@ -56,16 +56,30 @@ SHARED_LIBRARY_LIBS =			 \
 	$(DIST)/lib/librdfutil_s.a	 \
 	$(NULL)
 
+ifeq ($(OS_ARCH),HP-UX)
+EXTRA_DSO_LDOPTS = -c objs/objslist
+else
 EXTRA_DSO_LDOPTS =	       \
 	$(MKSHLIB_FORCE_ALL)   \
 	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin	       \
-	$(NULL)
+	$(MKSHLIB_UNFORCE_ALL)
+endif
+
+EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),HP-UX)
+shared_library_objs: $(SHARED_LIBRARY_LIBS)
+	rm -rf objs
+	mkdir objs
+	(cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \
+	| awk '{ print "objs/"$$3 }' > objs/objslist
+
+$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile
+else
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+endif
 
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/../resources/sidebar.xul $(DIST)/bin/res/rdf
diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in
index a586dd38265..8bd93fa3d4f 100644
--- a/mozilla/rdf/build/Makefile.in
+++ b/mozilla/rdf/build/Makefile.in
@@ -56,16 +56,30 @@ SHARED_LIBRARY_LIBS =			 \
 	$(DIST)/lib/librdfutil_s.a	 \
 	$(NULL)
 
+ifeq ($(OS_ARCH),HP-UX)
+EXTRA_DSO_LDOPTS = -c objs/objslist
+else
 EXTRA_DSO_LDOPTS =	       \
 	$(MKSHLIB_FORCE_ALL)   \
 	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin	       \
-	$(NULL)
+	$(MKSHLIB_UNFORCE_ALL)
+endif
+
+EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),HP-UX)
+shared_library_objs: $(SHARED_LIBRARY_LIBS)
+	rm -rf objs
+	mkdir objs
+	(cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \
+	| awk '{ print "objs/"$$3 }' > objs/objslist
+
+$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile
+else
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+endif
 
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/../resources/sidebar.xul $(DIST)/bin/res/rdf
diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in
index 1322326a3fd..69fda7d1189 100644
--- a/mozilla/widget/src/build/Makefile.in
+++ b/mozilla/widget/src/build/Makefile.in
@@ -62,14 +62,28 @@ SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
 	$(NULL)
 
+ifeq ($(OS_ARCH),HP-UX)
+EXTRA_DSO_LDOPTS += -c objs/objslist
+else
 EXTRA_DSO_LDOPTS+=	       \
 	$(MKSHLIB_FORCE_ALL)   \
 	$(SHARED_LIBRARY_LIBS) \
 	$(MKSHLIB_UNFORCE_ALL) \
 	$(NULL)
+endif
 
 EXTRA_DSO_LDOPTS += $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),HP-UX)
+shared_library_objs: $(SHARED_LIBRARY_LIBS)
+	rm -rf objs
+	mkdir objs
+	(cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \
+	| awk '{ print "objs/"$$3 }' > objs/objslist
+
+$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile
+else
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+endif