diff options
| author | Paul Park <pjpark@mit.edu> | 1995-07-07 20:58:36 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-07-07 20:58:36 +0000 |
| commit | f5feac72367bbaf855c57696036063ef150ce9b2 (patch) | |
| tree | d9ebac64d0e6562ab56863ae0d0437010d6e17b8 /src/admin/convert | |
| parent | 0e6ce6fec56ac88099d08622864877f923b84163 (diff) | |
| download | krb5-f5feac72367bbaf855c57696036063ef150ce9b2.tar.gz krb5-f5feac72367bbaf855c57696036063ef150ce9b2.tar.xz krb5-f5feac72367bbaf855c57696036063ef150ce9b2.zip | |
Reorganize library logic and use LDFLAGS from configure
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6250 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin/convert')
| -rw-r--r-- | src/admin/convert/ChangeLog | 5 | ||||
| -rw-r--r-- | src/admin/convert/Makefile.in | 17 | ||||
| -rw-r--r-- | src/admin/convert/configure.in | 4 |
3 files changed, 10 insertions, 16 deletions
diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog index 406bb5bb0..711fb80a7 100644 --- a/src/admin/convert/ChangeLog +++ b/src/admin/convert/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 15:35:07 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove all explicit library handling and LDFLAGS. + * configure.in - Add appropriate USE_<mumble> and KRB5_LIBRARIES. + + Thu Jun 15 15:27:36 EDT 1995 Paul Park (pjpark@mit.edu) * Makefile.in - Change explicit library names to -l<lib> form, and change target link line to use $(LD) and associated flags. diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in index f23609805..9a2997154 100644 --- a/src/admin/convert/Makefile.in +++ b/src/admin/convert/Makefile.in @@ -1,28 +1,13 @@ -KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ -KDB4_LIB = @KDB4_LIB@ - CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=-lkdb5 -DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = -lkrb5 $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) - - -DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) -LOCAL_LIBRARIES = $(KDBLIB) $(KDB4_LIB) $(KLIB) LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV all:: kdb5_convert kdb5_convert: kdb5_convert.o $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_convert kdb5_convert.o $(LIBS) install:: $(INSTALL_PROGRAM) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in index 77b90e890..72f2ed5df 100644 --- a/src/admin/convert/configure.in +++ b/src/admin/convert/configure.in @@ -3,5 +3,9 @@ CONFIG_RULES AC_PROG_INSTALL AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) +USE_KDB5_LIBRARY +USE_KDB4_LIBRARY +USE_KRB4_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |