Use DL_LIB and THREAD_LINKOPTS instead of explicitly specifying the dl

and pthread libraries by name.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17265 dc483132-0cff-0310-8789-dd5450dbe970

10 files changed, 27 insertions, 7 deletions

diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 2078bcab3..1d329dd45 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+ 	* Makefile.in (KDB5_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
+	instead of explicitly using -ldl and -lpthread.
+
 	Novell merge.
 	* Makefile.in:
 	* kdb5_mkdums.c:
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index 6a566b827..bbcd56ea7 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 SRCS=$(srcdir)/kdb5_mkdums.c
-KDB5_DEP_LIBS=-lpthread -ldl
+KDB5_DEP_LIBS=$(THREAD_LINKOPTS) $(DL_LIB)
 
 all:: kdb5_mkdums
 
diff --git a/src/tests/gss-threads/ChangeLog b/src/tests/gss-threads/ChangeLog
index 5d6d0c7f9..ae92cd926 100644
--- a/src/tests/gss-threads/ChangeLog
+++ b/src/tests/gss-threads/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-20  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (gss-client, gss-server): Use THREAD_LINKOPTS
+	instead of PTHREAD_LIBS.
+
 2005-03-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (all-unix): Use @THREAD_SUPPORT@ and helper targets
diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in
index 88ee89461..edb452530 100644
--- a/src/tests/gss-threads/Makefile.in
+++ b/src/tests/gss-threads/Makefile.in
@@ -19,10 +19,10 @@ all-unix-0::
 all-windows:: $(OUTPRE)gss-server.exe $(OUTPRE)gss-client.exe
 
 gss-server: gss-server.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) $(PTHREAD_CFLAGS) -o gss-server gss-server.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(PTHREAD_LIBS)
+	$(CC_LINK) $(PTHREAD_CFLAGS) -o gss-server gss-server.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) $(PTHREAD_CFLAGS) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(PTHREAD_LIBS)
+	$(CC_LINK) $(PTHREAD_CFLAGS) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 $(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
 	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
diff --git a/src/tests/shlib/ChangeLog b/src/tests/shlib/ChangeLog
index 32e9b4834..bfea7ca78 100644
--- a/src/tests/shlib/ChangeLog
+++ b/src/tests/shlib/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-20  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (t_loader): Use DL_LIB instead of -ldl.
+
 2005-02-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* t_loader.c (verbose): New variable.
diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in
index daf8ff0af..49cf20fa2 100644
--- a/src/tests/shlib/Makefile.in
+++ b/src/tests/shlib/Makefile.in
@@ -21,7 +21,7 @@ valgrind-t_loader: t_loader
 	$(RUN_SETUP) $(VALGRIND) $(VALGRINDFLAGS) ./t_loader
 
 t_loader: t_loader.o
-	$(CC_LINK) -o t_loader t_loader.o -ldl
+	$(CC_LINK) -o t_loader t_loader.o $(DL_LIB)
 
 check-unix::
 
diff --git a/src/tests/threads/ChangeLog b/src/tests/threads/ChangeLog
index 32fde2353..704a05253 100644
--- a/src/tests/threads/ChangeLog
+++ b/src/tests/threads/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-20  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (t_rcache, prof1): Use THREAD_LINKOPTS instead of
+	-lpthread.
+
 2004-12-12  Ken Raeburn  <raeburn@mit.edu>
 
 	* prof1.c: New file.
diff --git a/src/tests/threads/Makefile.in b/src/tests/threads/Makefile.in
index c164717e7..5386d00e1 100644
--- a/src/tests/threads/Makefile.in
+++ b/src/tests/threads/Makefile.in
@@ -16,7 +16,7 @@ run-t_rcache: t_rcache
 	$(RUN_SETUP) ./t_rcache -n $(N)
 
 t_rcache: t_rcache.o $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) -o t_rcache t_rcache.o $(KRB5_BASE_LIBS) -lpthread
+	$(CC_LINK) -o t_rcache t_rcache.o $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 syms: syms.o
 	$(CC_LINK) -o syms syms.o
@@ -25,7 +25,7 @@ run-syms: syms
 	$(RUN_SETUP) ./syms
 
 prof1: prof1.o $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) -o prof1 prof1.o $(KRB5_BASE_LIBS) -lpthread
+	$(CC_LINK) -o prof1 prof1.o $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 prof1.o: prof1.c
 
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 61b7357aa..0fec8083b 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+	* Makefile.in (KDB5_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
+	instead of explicitly using -ldl and -lpthread.
+
 	Novell merge.
 	* Makefile.in:
 	* kdb5_verify.c:
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index 0444803c0..c774e0c74 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -4,7 +4,7 @@ mydir=verify
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-KDB5_DEP_LIB=-lpthread -ldl
+KDB5_DEP_LIB=$(THREAD_LINKOPTS) $(DL_LIB)
 
 SRCS=$(srcdir)/kdb5_verify.c