diff options
| author | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
| commit | b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91 (patch) | |
| tree | 40f4f5b31ddbca1f791d2f080e3da04cf3bcc109 /src/admin/destroy | |
| parent | 821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff) | |
| download | krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.gz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.xz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.zip | |
Shared library Makefile/configure changes and cleanup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6069 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin/destroy')
| -rw-r--r-- | src/admin/destroy/ChangeLog | 9 | ||||
| -rw-r--r-- | src/admin/destroy/Makefile.in | 9 | ||||
| -rw-r--r-- | src/admin/destroy/configure.in | 3 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog index 7812b968b..64357597d 100644 --- a/src/admin/destroy/ChangeLog +++ b/src/admin/destroy/ChangeLog @@ -1,4 +1,13 @@ +Thu Jun 15 15:31:59 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. + Also, remove DBMLIB, it was not used. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + + Tue May 30 14:41:50 EDT 1995 Paul Park (pjpark@mit.edu) * kdb5_destroy.c: Remove knowledge of database files. Use kdb5_db_ destroy to destroy the database. diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in index 01303acab..05770f350 100644 --- a/src/admin/destroy/Makefile.in +++ b/src/admin/destroy/Makefile.in @@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) @@ -18,7 +17,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) all:: kdb5_destroy kdb5_destroy: kdb5_destroy.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in index 92792cc89..898b67832 100644 --- a/src/admin/destroy/configure.in +++ b/src/admin/destroy/configure.in @@ -1,6 +1,5 @@ AC_INIT(kdb5_destroy.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |