From 7eb3f3dedaa4c0edbe14c3d3d9617051c31c3e69 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 21 Jun 2005 02:54:15 +0000 Subject: [PATCH] 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 --- src/kadmin/cli/ChangeLog | 3 +++ src/kadmin/cli/Makefile.in | 2 +- src/kadmin/dbutil/ChangeLog | 3 +++ src/kadmin/dbutil/Makefile.in | 2 +- src/kadmin/server/ChangeLog | 3 +++ src/kadmin/server/Makefile.in | 2 +- src/kadmin/testing/util/ChangeLog | 3 +++ src/kadmin/testing/util/Makefile.in | 2 +- src/kdc/ChangeLog | 3 +++ src/kdc/Makefile.in | 2 +- src/krb524/ChangeLog | 3 +++ src/krb524/Makefile.in | 2 +- src/lib/kadm5/unit-test/ChangeLog | 3 +++ src/lib/kadm5/unit-test/Makefile.in | 2 +- src/tests/create/ChangeLog | 3 +++ src/tests/create/Makefile.in | 2 +- src/tests/gss-threads/ChangeLog | 5 +++++ src/tests/gss-threads/Makefile.in | 4 ++-- src/tests/shlib/ChangeLog | 4 ++++ src/tests/shlib/Makefile.in | 2 +- src/tests/threads/ChangeLog | 5 +++++ src/tests/threads/Makefile.in | 4 ++-- src/tests/verify/ChangeLog | 3 +++ src/tests/verify/Makefile.in | 2 +- 24 files changed, 55 insertions(+), 14 deletions(-) diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index d94a55835..2cb7b032c 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,5 +1,8 @@ 2005-06-20 Ken Raeburn + * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS + instead of explicitly using -ldl and -lpthread. + Novell merge. * Makefile.in: * kadmin.c: diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index 992f6ef73..ecde8640b 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -4,7 +4,7 @@ mydir=cli BUILDTOP=$(REL)..$(S).. PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -KDB_DEP_LIB=-ldl -lpthread +KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) PROG = kadmin OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o keytab.o diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index dae3be477..7d110fb7d 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,5 +1,8 @@ 2005-06-20 Ken Raeburn + * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS + instead of explicitly using -ldl and -lpthread. + Novell merge. * Makefile.in: * dump.c: diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in index 6f1fae627..8e0725fe3 100644 --- a/src/kadmin/dbutil/Makefile.in +++ b/src/kadmin/dbutil/Makefile.in @@ -6,7 +6,7 @@ DEFINES = -DKDB4_DISABLE LOCALINCLUDES = -I. @KRB4_INCLUDES@ PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) PROG_RPATH=$(KRB5_LIBDIR) -KDB_DEP_LIB=-ldl -lpthread +KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) PROG = kdb5_util ###OBJS = kdb5_util.o dump.o dumpv4.o loadv4.o \ diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index 12c9bce4c..d0903c49f 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,5 +1,8 @@ 2005-06-20 Ken Raeburn + * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS + instead of explicitly using -ldl and -lpthread. + Novell merge. * Makefile.in: * misc.c: diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 74a8e1bb3..391e89773 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -2,7 +2,7 @@ thisconfigdir=./.. myfulldir=kadmin/server mydir=server BUILDTOP=$(REL)..$(S).. -KDB_DEP_LIB=-ldl -lpthread +KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) LOCALINCLUDES = -I$(SRCTOP)/lib/gssapi/generic -I$(SRCTOP)/lib/gssapi/krb5 \ -I$(BUILDTOP)/lib/gssapi/generic -I$(BUILDTOP)/lib/gssapi/krb5 diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index a81e3491f..6101c09c7 100644 --- a/src/kadmin/testing/util/ChangeLog +++ b/src/kadmin/testing/util/ChangeLog @@ -1,5 +1,8 @@ 2005-06-20 Ken Raeburn + * Makefile.in (KDB_DEP_LIB): Use THREAD_LINKOPTS instead of + explicitly using -lpthread. + Novell merge. * Makefile.in: * tcl_kadm5.c: diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index f53861e21..6efa98ab8 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -6,7 +6,7 @@ LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/ # Force Tcl headers to use stdarg.h, because krb5 does too, and if # Tcl uses varargs.h it'll just mess things up. DEFINES= -DHAS_STDARG -KRB5_PTHREAD_LIB=-lpthread +KRB5_PTHREAD_LIB=$(THREAD_LINKOPTS) PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 47a6d23ac..8cbcf5bc1 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,5 +1,8 @@ 2005-06-20 Ken Raeburn + * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS + instead of explicitly using -ldl and -lpthread. + Novell merge. * Makefile.in: * main.c: diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 9b18c4e91..32526ab64 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -10,7 +10,7 @@ BUILDTOP=$(REL).. DEFINES = # -DNOCACHE RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) -KDB5_LIB_DEPS=-ldl -lpthread +KDB5_LIB_DEPS=$(DL_LIB) $(THREAD_LINKOPTS) PROG_RPATH=$(KRB5_LIBDIR) FAKEKA=@FAKEKA@ diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 7e404b482..a8644ed90 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,5 +1,8 @@ 2005-06-20 Ken Raeburn + * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS + instead of explicitly using -ldl and -lpthread. + Novell merge. * Makefile.in: * krb524d.c: diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index acbfb0da5..504f7456c 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -2,7 +2,7 @@ thisconfigdir=.. myfulldir=krb524 mydir=krb524 BUILDTOP=$(REL).. -KDB_DEP_LIB=-ldl -lpthread +KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) # Copyright 1994 by OpenVision Technologies, Inc. # diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index 67c82bcd3..446c9af44 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,5 +1,8 @@ 2005-06-20 Ken Raeburn + * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS + instead of explicitly using -ldl and -lpthread. + Novell merge. * Makefile.in: * destroy-test.c: diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index 242e9c256..88c0905b3 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. DEFINES = -DUSE_KADM5_API_VERSION=1 PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -KDB_DEP_LIB=-ldl -lpthread +KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) all:: init-test destroy-test client-handle-test client-iter-test all:: randkey-test server-handle-test lock-test server-iter-test 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 + * 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 + + * Makefile.in (gss-client, gss-server): Use THREAD_LINKOPTS + instead of PTHREAD_LIBS. + 2005-03-25 Ken Raeburn * 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 + + * Makefile.in (t_loader): Use DL_LIB instead of -ldl. + 2005-02-08 Ken Raeburn * 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 + + * Makefile.in (t_rcache, prof1): Use THREAD_LINKOPTS instead of + -lpthread. + 2004-12-12 Ken Raeburn * 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 + * 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 -- 2.26.2