From 71f0c82709f8bd435e5ccf01c04a20e352314a96 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 5 Apr 1998 06:43:33 +0000
Subject: [PATCH] shared library dependencies

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4732 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/auth/afskauthlib/Makefile.in |  8 +++++++-
 lib/auth/pam/Makefile.in         |  5 ++++-
 lib/auth/sia/Makefile.in         | 10 +++++++++-
 lib/com_err/Makefile.in          |  4 +++-
 lib/des/Makefile.in              |  4 +++-
 lib/editline/Makefile.in         |  4 +++-
 lib/kafs/Makefile.in             |  4 +++-
 lib/otp/Makefile.in              |  4 +++-
 lib/sl/Makefile.in               |  4 +++-
 9 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in
index b41e49c78..5b4f698ec 100644
--- a/lib/auth/afskauthlib/Makefile.in
+++ b/lib/auth/afskauthlib/Makefile.in
@@ -22,6 +22,12 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
 
+LIB_DEPS = -L../../kafs -lkafs			\
+	   -L../../krb -lkrb			\
+	   -L../../des -ldes			\
+	   -L../../roken -lroken		\
+	   -lc
+
 PICFLAGS = @REAL_PICFLAGS@
 LDSHARED = @LDSHARED@
 SHLIBEXT = @REAL_SHLIBEXT@
@@ -78,6 +84,6 @@ $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -lkafs -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken
+	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) $(LIB_DEPS)
 
 .PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in
index 85d5613c9..2ec841b30 100644
--- a/lib/auth/pam/Makefile.in
+++ b/lib/auth/pam/Makefile.in
@@ -26,6 +26,9 @@ LDSHARED = @LDSHARED@
 SHLIBEXT = @REAL_SHLIBEXT@
 LD_FLAGS = @REAL_LD_FLAGS@
  
+LIB_DEPS = -L../../kafs -L../../krb -L../../des -L../../roken \
+	   -lkafs -lkrb -ldes -lroken -lc
+
 LIB = pam_krb4.$(SHLIBEXT)
 
 SOURCES = pam.c
@@ -78,7 +81,7 @@ $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -L../../krb -L../../des -L../../roken -lkafs -lkrb -ldes -lroken
+	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) $(LIB_DEPS)
 #	$(CC) -shared -Wl,-x -o $(LIB) $(OBJECTS)  ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
 
 .PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in
index 026dfd66d..178457652 100644
--- a/lib/auth/sia/Makefile.in
+++ b/lib/auth/sia/Makefile.in
@@ -27,6 +27,14 @@ LDSHARED = @LDSHARED@
 SHLIBEXT = @REAL_SHLIBEXT@
 LD_FLAGS = @REAL_LD_FLAGS@
  
+LIB_DEPS = -L../../kafs -lkafs			\
+	   -L../../kadm -lkadm			\
+	   -L../../krb -lkrb			\
+	   -L../../des -ldes			\
+	   -L../../roken -lroken		\
+	   @LIB_getpwnam_r@			\
+	   -lc
+
 LIB = libsia_krb4.$(SHLIBEXT)
 
 SOURCES = sia.c
@@ -79,6 +87,6 @@ $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) -shared -o $@ -rpath $(libdir) -hidden -exported_symbol siad_\* $(OBJECTS) -L../../kafs -lkafs -L../../kadm -lkadm -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken @LIB_getpwnam_r@ -lc
+	$(LDSHARED) -shared -o $@ -rpath $(libdir) -hidden -exported_symbol siad_\* $(OBJECTS) $(LIB_DEPS)
 
 .PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
diff --git a/lib/com_err/Makefile.in b/lib/com_err/Makefile.in
index 9158d9731..edbd1b249 100644
--- a/lib/com_err/Makefile.in
+++ b/lib/com_err/Makefile.in
@@ -31,6 +31,8 @@ includedir = @includedir@
 
 PICFLAGS = @PICFLAGS@
  
+LIB_DEPS = -lc
+
 LIBNAME = $(LIBPREFIX)com_err
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
@@ -112,7 +114,7 @@ $(LIBNAME).a: $(OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(OBJECTS) $(LDOBJ)
 	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS) $(LDOBJ) $(LIBDES)
+	$(LDSHARED) -o $@ $(OBJECTS) $(LDOBJ) $(LIB_DEPS)
 
 
 COBJ = compile_et.o parse.o lex.o
diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in
index 95751ca6d..4a64081cb 100644
--- a/lib/des/Makefile.in
+++ b/lib/des/Makefile.in
@@ -29,6 +29,8 @@ EXECSUFFIX=@EXECSUFFIX@
 
 PICFLAGS = @PICFLAGS@
  
+LIB_DEPS = -lc
+
 PROGS = destest$(EXECSUFFIX) \
 	mdtest$(EXECSUFFIX) \
 	des$(EXECSUFFIX) \
@@ -118,7 +120,7 @@ $(LIBNAME).a: $(LIBOBJ)
 
 $(LIBNAME).$(SHLIBEXT): $(LIBOBJ)
 	rm -f $@
-	$(LDSHARED) -o $@ $(LIBOBJ)
+	$(LDSHARED) -o $@ $(LIBOBJ) $(LIB_DEPS)
 
 # To make psoriaris make happy we have to mention these files in some
 # rule, so we might as well put them here.
diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index f148116ed..524ddcd9f 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -30,6 +30,8 @@ LIBPREFIX = @LIBPREFIX@
 LDSHARED = @LDSHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 
+LIB_DEPS = @LIB_tgetent@ -lc
+
 SOURCES = edit_compat.c editline.c complete.c sysunix.c
 
 OBJECTS = @editline_OBJS@
@@ -79,7 +81,7 @@ $(LIBNAME).a: $(OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS)
+	$(LDSHARED) -o $@ $(OBJECTS) $(LIB_DEPS)
 
 $(OBJECTS): ../../include/config.h
 
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index a3e24409a..fd483fd21 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -23,6 +23,8 @@ libdir = @libdir@
 
 PICFLAGS = @PICFLAGS@
  
+LIB_DEPS = -lc
+
 LIBNAME = $(LIBPREFIX)kafs
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
@@ -85,7 +87,7 @@ $(LIBNAME).a: $(OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS)
+	$(LDSHARED) -o $@ $(OBJECTS) $(LIB_DEPS)
 
 # AIX: this almost works with gcc, but somehow it fails to use the
 # correct ld, use ld instead
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index ffcc568d3..14302c7ac 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -25,6 +25,8 @@ libdir = @libdir@
 
 PICFLAGS = @PICFLAGS@
  
+LIB_DEPS = $(LIB_DBM) -lc
+
 LIBNAME = $(LIBPREFIX)otp
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
@@ -91,7 +93,7 @@ $(LIBNAME).a: $(LIB_OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
 	rm -f $@
-	$(LDSHARED) -o $@ $(LIB_OBJECTS)
+	$(LDSHARED) -o $@ $(LIB_OBJECTS) $(LIB_DEPS)
 
 $(OBJECTS): ../../include/config.h
 
diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in
index 705e5a61d..f14de27d6 100644
--- a/lib/sl/Makefile.in
+++ b/lib/sl/Makefile.in
@@ -25,6 +25,8 @@ libdir = @libdir@
 bindir = @bindir@
 includedir = @includedir@
 
+LIB_DEPS = @LIB_readline@ -lc
+
 PICFLAGS = @PICFLAGS@
 EXECSUFFIX = @EXECSUFFIX@
  
@@ -92,7 +94,7 @@ $(LIBNAME).a: $(LIB_OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
 	rm -f $@
-	$(LDSHARED) -o $@ $(LIB_OBJECTS)
+	$(LDSHARED) -o $@ $(LIB_OBJECTS) $(LIB_DEPS)
 
 $(OBJECTS): ../../include/config.h