From 350f92f5e097f6d17396536b9710f72ad947710b Mon Sep 17 00:00:00 2001 From: Paul Park Date: Fri, 7 Jul 1995 21:09:13 +0000 Subject: [PATCH] Reorganize library logic and use LDFLAGS from configure git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6265 dc483132-0cff-0310-8789-dd5450dbe970 --- src/slave/ChangeLog | 5 +++++ src/slave/Makefile.in | 15 ++------------- src/slave/configure.in | 2 ++ src/tests/asn.1/ChangeLog | 5 +++++ src/tests/asn.1/Makefile.in | 15 +++++---------- src/tests/asn.1/configure.in | 2 ++ src/tests/create/ChangeLog | 5 +++++ src/tests/create/Makefile.in | 12 +----------- src/tests/create/configure.in | 2 ++ src/tests/hammer/ChangeLog | 5 +++++ src/tests/hammer/Makefile.in | 11 ++--------- src/tests/hammer/configure.in | 2 ++ src/tests/resolve/ChangeLog | 5 +++++ src/tests/resolve/Makefile.in | 6 ++---- src/tests/resolve/configure.in | 2 ++ src/tests/verify/ChangeLog | 5 +++++ src/tests/verify/Makefile.in | 12 +----------- src/tests/verify/configure.in | 2 ++ 18 files changed, 55 insertions(+), 58 deletions(-) diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index 14e4ba66c..710798539 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,8 @@ + +Fri Jul 7 16:34:36 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove all explicit library handling and LDFLAGS. + * configure.in - Add USE_KDB5_LIBRARY and KRB5_LIBRARIES. + Wed July 5 15:52:31 1995 James Mattly * kprop.c changed open to THREEPARAMOPEN diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 22e6cc67f..c1b8edf9c 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,18 +1,7 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -KDBLIB=-lkdb5 - -KLIB = -lkrb5 -lcrypto $(COMERRLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) all:: - - DEPLIBS = $(DEPKLIB) -LOCAL_LIBRARIES = $(KLIB) - CLIENTSRCS= $(srcdir)/kprop.c CLIENTOBJS= kprop.o @@ -24,14 +13,14 @@ SRCS= $(CLIENTSRCS) $(SERVERSRCS) all:: kprop kpropd kprop: $(CLIENTOBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o kprop $(CLIENTOBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kprop $(CLIENTOBJS) $(LIBS) install:: $(INSTALL_PROGRAM) kprop ${DESTDIR}$(SERVER_BINDIR)/kprop $(INSTALL_DATA) $(srcdir)/kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.8 kpropd: $(SERVEROBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o kpropd $(SERVEROBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kpropd $(SERVEROBJS) $(LIBS) install:: $(INSTALL_PROGRAM) kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd diff --git a/src/slave/configure.in b/src/slave/configure.in index 12c9830be..8c6982bb7 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -17,5 +17,7 @@ else fi AC_SUBST(DBFLAGS)dnl dnl +USE_KDB5_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog index 0dade2ec0..520a5ce0d 100644 --- a/src/tests/asn.1/ChangeLog +++ b/src/tests/asn.1/ChangeLog @@ -1,3 +1,8 @@ + +Fri Jul 7 16:36:12 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove explicit library handling and LDFLAGS. + * configure.in - Add KRB5_LIBRARIES and V5_USE_SHARED_LIB. + Tue Jun 20 14:56:53 1995 * ktest.h, ktest_equal.h: Change PROTOTYPE to KRB5_PROTOTYPE diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in index 0b4157abf..5eafdf165 100644 --- a/src/tests/asn.1/Makefile.in +++ b/src/tests/asn.1/Makefile.in @@ -1,25 +1,20 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES) -LDFLAGS = -g -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= +COMERRLIB=$(TOPLIBD)/libcom_err.a all:: krb5_encode_test krb5_decode_test -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) - LOCALINCLUDES = -I$(srcdir)/../../lib/krb5/asn.1 ENCOBJS = krb5_encode_test.o ktest.o ktest_equal.o utility.o trval.o -krb5_encode_test: $(ENCOBJS) $(DEPKLIB) - $(LD) $(CFLAGS) -o krb5_encode_test $(ENCOBJS) $(LIBS) $(KLIB) +krb5_encode_test: $(ENCOBJS) $(DEPLIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o krb5_encode_test $(ENCOBJS) $(LIBS) DECOBJS = krb5_decode_test.o ktest.o ktest_equal.o utility.o -krb5_decode_test: $(DECOBJS) $(DEPKLIB) - $(LD) $(CFLAGS) -o krb5_decode_test $(DECOBJS) $(LIBS) $(KLIB) +krb5_decode_test: $(DECOBJS) $(DEPLIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o krb5_decode_test $(DECOBJS) $(LIBS) check:: krb5_decode_test krb5_encode_test ./krb5_decode_test diff --git a/src/tests/asn.1/configure.in b/src/tests/asn.1/configure.in index feeddf0e0..fc8db02c6 100644 --- a/src/tests/asn.1/configure.in +++ b/src/tests/asn.1/configure.in @@ -1,4 +1,6 @@ AC_INIT(krb5_encode_test.c) CONFIG_RULES AC_PROG_INSTALL +KRB5_LIBRARIES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog index 90b816de4..4ca752457 100644 --- a/src/tests/create/ChangeLog +++ b/src/tests/create/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 16:37:07 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove explicit library handling and LDFLAGS. + * configure.in - Add USE_KDB5_LIBRARY and KRB5_LIBRARIES + + Thu Jun 15 18:10:55 EDT 1995 Paul Park (pjpark@mit.edu) * Makefile.in - Remove DBMLIB. * configure.in - Remove check for dbm libraries. Use shared library diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in index 6af3bc10c..e011bc828 100644 --- a/src/tests/create/Makefile.in +++ b/src/tests/create/Makefile.in @@ -1,19 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -KDBLIB=$(TOPLIBD)/libkdb5.a -DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: kdb5_mkdums -KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) -DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) - -DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) - kdb5_mkdums: kdb5_mkdums.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_mkdums kdb5_mkdums.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_mkdums kdb5_mkdums.o $(LIBS) kdb5_mkdums.o: $(srcdir)/kdb5_mkdums.c diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in index d5bb2a8ee..f092073d2 100644 --- a/src/tests/create/configure.in +++ b/src/tests/create/configure.in @@ -1,5 +1,7 @@ AC_INIT(kdb5_mkdums.c) CONFIG_RULES AC_PROG_INSTALL +USE_KDB5_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog index f2db3db5b..19d430dcc 100644 --- a/src/tests/hammer/ChangeLog +++ b/src/tests/hammer/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 16:37:54 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove explicit library handling and LDFLAGS. + * configure.in - Add KRB5_LIBRARIES and V5_USE_SHARED_LIB. + + Thu Jun 22 12:02:48 EDT 1995 Paul Park (pjpark@mit.edu) * kdc5_hammer.c - Change generation of server principals so that we can use kdc5_hammer with kdb5_mkdums. Also add logic diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in index dfd9364df..a8f729a21 100644 --- a/src/tests/hammer/Makefile.in +++ b/src/tests/hammer/Makefile.in @@ -1,16 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= all:: kdc5_hammer -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) - -kdc5_hammer: kdc5_hammer.o $(DEPKLIB) - $(CC) $(CFLAGS) -o kdc5_hammer kdc5_hammer.o $(KLIB) $(LIBS) +kdc5_hammer: kdc5_hammer.o $(DEPLIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdc5_hammer kdc5_hammer.o $(LIBS) kdc5_hammer.o: $(srcdir)/kdc5_hammer.c diff --git a/src/tests/hammer/configure.in b/src/tests/hammer/configure.in index c9924fedb..a71a0b790 100644 --- a/src/tests/hammer/configure.in +++ b/src/tests/hammer/configure.in @@ -1,4 +1,6 @@ AC_INIT(kdc5_hammer.c) CONFIG_RULES AC_PROG_INSTALL +KRB5_LIBRARIES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/resolve/ChangeLog b/src/tests/resolve/ChangeLog index 9c0701868..888a434c7 100644 --- a/src/tests/resolve/ChangeLog +++ b/src/tests/resolve/ChangeLog @@ -1,3 +1,8 @@ + +Fri Jul 7 16:38:47 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove LDFLAGS and use DEPLIBS. + * configure.in - Add KRB5_LIBRARIES and V5_USE_SHARED_LIB + Fri Jun 9 18:58:43 1995 * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in index 8c0c0e61a..4e2442661 100644 --- a/src/tests/resolve/Makefile.in +++ b/src/tests/resolve/Makefile.in @@ -1,14 +1,12 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES) -LDFLAGS = -g OBJS=resolve.o SRCS=$(srcdir)/resolve.c all:: resolve - -resolve: $(OBJS) - $(LD) $(CFLAGS) -o resolve $(OBJS) $(LIBS) +resolve: $(OBJS) $(DEPLIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o resolve $(OBJS) $(LIBS) check:: resolve ./resolve diff --git a/src/tests/resolve/configure.in b/src/tests/resolve/configure.in index 6c4855abc..5d5886193 100644 --- a/src/tests/resolve/configure.in +++ b/src/tests/resolve/configure.in @@ -3,4 +3,6 @@ CONFIG_RULES AC_HEADER_STDC AC_CHECK_FUNCS(strchr) AC_CHECK_HEADERS(sys/param.h sys/socket.h) +KRB5_LIBRARIES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog index 6262b241e..1a7e90cfb 100644 --- a/src/tests/verify/ChangeLog +++ b/src/tests/verify/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 16:40:26 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove explicit library handling and LDFLAGS. + * configure.in - Add USE_KDB5_LIBRARY and KRB5_LIBRARIES + + Thu Jun 15 18:12:00 EDT 1995 Paul Park (pjpark@mit.edu) * Makefile.in - Remove DBMLIB. * configure.in - Remove check for dbm libraries, use shared library diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in index 4b18e5d4e..ae167a1b6 100644 --- a/src/tests/verify/Makefile.in +++ b/src/tests/verify/Makefile.in @@ -1,19 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -KDBLIB=$(TOPLIBD)/libkdb5.a -DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: kdb5_verify -KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) -DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) - -DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) - kdb5_verify: kdb5_verify.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_verify kdb5_verify.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_verify kdb5_verify.o $(LIBS) kdb5_verify.o: $(srcdir)/kdb5_verify.c diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in index df7581590..e0549957b 100644 --- a/src/tests/verify/configure.in +++ b/src/tests/verify/configure.in @@ -1,5 +1,7 @@ AC_INIT(kdb5_verify.c) CONFIG_RULES AC_PROG_INSTALL +USE_KDB5_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE -- 2.26.2