summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2005-06-21 02:54:15 +0000
committerKen Raeburn <raeburn@mit.edu>2005-06-21 02:54:15 +0000
commit7eb3f3dedaa4c0edbe14c3d3d9617051c31c3e69 (patch)
treece31677bc201fe68be43eedee414dd1122e3687b
parent8e1a4096998997ca87d7f40d40992224968963b7 (diff)
downloadkrb5-7eb3f3dedaa4c0edbe14c3d3d9617051c31c3e69.tar.gz
krb5-7eb3f3dedaa4c0edbe14c3d3d9617051c31c3e69.tar.xz
krb5-7eb3f3dedaa4c0edbe14c3d3d9617051c31c3e69.zip
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
Diffstat
-rw-r--r--src/kadmin/cli/ChangeLog3
-rw-r--r--src/kadmin/cli/Makefile.in2
-rw-r--r--src/kadmin/dbutil/ChangeLog3
-rw-r--r--src/kadmin/dbutil/Makefile.in2
-rw-r--r--src/kadmin/server/ChangeLog3
-rw-r--r--src/kadmin/server/Makefile.in2
-rw-r--r--src/kadmin/testing/util/ChangeLog3
-rw-r--r--src/kadmin/testing/util/Makefile.in2
-rw-r--r--src/kdc/ChangeLog3
-rw-r--r--src/kdc/Makefile.in2
-rw-r--r--src/krb524/ChangeLog3
-rw-r--r--src/krb524/Makefile.in2
-rw-r--r--src/lib/kadm5/unit-test/ChangeLog3
-rw-r--r--src/lib/kadm5/unit-test/Makefile.in2
-rw-r--r--src/tests/create/ChangeLog3
-rw-r--r--src/tests/create/Makefile.in2
-rw-r--r--src/tests/gss-threads/ChangeLog5
-rw-r--r--src/tests/gss-threads/Makefile.in4
-rw-r--r--src/tests/shlib/ChangeLog4
-rw-r--r--src/tests/shlib/Makefile.in2
-rw-r--r--src/tests/threads/ChangeLog5
-rw-r--r--src/tests/threads/Makefile.in4
-rw-r--r--src/tests/verify/ChangeLog3
-rw-r--r--src/tests/verify/Makefile.in2
24 files changed, 55 insertions, 14 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index d94a558356..2cb7b032c2 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,5 +1,8 @@
2005-06-20 Ken Raeburn <raeburn@mit.edu>
+ * 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 992f6ef736..ecde8640be 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 dae3be477c..7d110fb7db 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,5 +1,8 @@
2005-06-20 Ken Raeburn <raeburn@mit.edu>
+ * 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 6f1fae6278..8e0725fe33 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 12c9bce4ce..d0903c49fe 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,5 +1,8 @@
2005-06-20 Ken Raeburn <raeburn@mit.edu>
+ * 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 74a8e1bb38..391e897738 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 a81e3491f8..6101c09c73 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,5 +1,8 @@
2005-06-20 Ken Raeburn <raeburn@mit.edu>
+ * 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 f53861e211..6efa98ab8c 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 47a6d23ac0..8cbcf5bc16 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,5 +1,8 @@
2005-06-20 Ken Raeburn <raeburn@mit.edu>
+ * 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 9b18c4e912..32526ab64b 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 7e404b482c..a8644ed903 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,5 +1,8 @@
2005-06-20 Ken Raeburn <raeburn@mit.edu>
+ * 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 acbfb0da50..504f7456cb 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 67c82bcd36..446c9af44b 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,5 +1,8 @@
2005-06-20 Ken Raeburn <raeburn@mit.edu>
+ * 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 242e9c256e..88c0905b3a 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 2078bcab3b..1d329dd454 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 6a566b827b..bbcd56ea7c 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 5d6d0c7f93..ae92cd9262 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 88ee894618..edb4525300 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 32e9b48345..bfea7ca78b 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 daf8ff0af5..49cf20fa23 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 32fde2353a..704a052534 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 c164717e78..5386d00e1b 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 61b7357aa2..0fec8083b9 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 0444803c04..c774e0c74d 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
generated by cgit (git 2.34.1) at 2025-01-11 00:38:59 +0000