summaryrefslogtreecommitdiffstats
path: root/src/admin/aname
diff options
context:
space:
mode:
authorPaul Park <pjpark@mit.edu>1995-07-07 20:58:36 +0000
committerPaul Park <pjpark@mit.edu>1995-07-07 20:58:36 +0000
commitf5feac72367bbaf855c57696036063ef150ce9b2 (patch)
treed9ebac64d0e6562ab56863ae0d0437010d6e17b8 /src/admin/aname
parent0e6ce6fec56ac88099d08622864877f923b84163 (diff)
downloadkrb5-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/aname')
-rw-r--r--src/admin/aname/ChangeLog5
-rw-r--r--src/admin/aname/Makefile.in15
-rw-r--r--src/admin/aname/configure.in1
3 files changed, 7 insertions, 14 deletions
diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog
index a8239d450d..43736767dd 100644
--- a/src/admin/aname/ChangeLog
+++ b/src/admin/aname/ChangeLog
@@ -1,4 +1,9 @@
+Fri Jul 7 15:34:15 EDT 1995 Paul Park (pjpark@mit.edu)
+ * Makefile.in - Remove all explicit library handling and LDFLAGS.
+ * configure.in - Add KRB5_LIBRARIES.
+
+
Fri Jun 30 14:28:20 EDT 1995 Paul Park (pjpark@mit.edu)
* kdb5_anadd.c - Add ability to select between Berkeley and DBM format
at compile time.
diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 7e25cbf78b..1de452a4b9 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -1,25 +1,12 @@
DBFLAGS=@DBFLAGS@
CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DBFLAGS)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=-lkdb5
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a
all::
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
-
all:: kdb5_anadd
kdb5_anadd: kdb5_anadd.o $(DEPLIBS)
- $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_anadd kdb5_anadd.o $(LIBS)
install::
$(INSTALL_PROGRAM) kdb5_anadd $(DESTDIR)$(ADMIN_BINDIR)/kdb5_anadd
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 6164b57842..397536e557 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -35,5 +35,6 @@ else
fi
AC_SUBST(DBFLAGS)dnl
dnl
+KRB5_LIBRARIES
V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE