Keep my own specially optimized HP-UX shared library building up to date.

Submitted by:
Reviewed by:
PR:

1 files changed, 5 insertions, 22 deletions

diff --git a/shlib/Makefile.hpux10-cc b/shlib/Makefile.hpux10-cc
index 4dc62ebd9e..4d2d19bcf2 100644
--- a/shlib/Makefile.hpux10-cc
+++ b/shlib/Makefile.hpux10-cc
@@ -1,12 +1,12 @@
 # Makefile.hpux-cc
 
-major=1
+major=0.9.7
 
 slib=libssl
-sh_slib=$(slib).so.$(major)
+sh_slib=$(slib).sl.$(major)
 
 clib=libcrypto
-sh_clib=$(clib).so.$(major)
+sh_clib=$(clib).sl.$(major)
 
 all : $(clib).sl $(slib).sl
 
@@ -20,31 +20,14 @@ $(slib)_pic.a : $(slib).a
 	cp -p $? $@
 
 $(sh_clib) : $(clib)_pic.a
-	echo "collecting all object files for $@"
-	find . -name \*.o -print > allobjs
-	for obj in `ar t $(clib)_pic.a`; \
-	do \
-		grep /$$obj allobjs; \
-	done >objlist
-	echo "linking $@"
-	ld -b -s -z +h $@ -o $@ `cat objlist` -lc 
-	rm allobjs objlist
+	ld -b -s -z +h $@ -o $@ -Fl $(clib)_pic.a -ldld -lc 
 
 $(clib).sl : $(sh_clib)
 	rm -f $@
 	ln -s $? $@
 
 $(sh_slib) : $(slib)_pic.a $(clib).sl
-	echo "collecting all object files for $@"
-	find . -name \*.o -print > allobjs
-	for obj in `ar t $(slib)_pic.a`; \
-	do \
-		grep /$$obj allobjs; \
-	done >objlist
-	echo "linking $@"
-	ld -b -s -z +h $@ +b /usr/local/ssl/lib:/usr/lib -o $@ `cat objlist` \
-			-L. -lcrypto -lc
-	rm -f allobjs objlist
+	ld -b -s -z +h $@ -o $@ -Fl $(slib)_pic.a -ldld -lc
         
 $(slib).sl : $(sh_slib)
 	rm -f $@