summaryrefslogtreecommitdiffstats
path: root/src/kadmin.old/client
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/kadmin.old/client
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/kadmin.old/client')
-rw-r--r--src/kadmin.old/client/ChangeLog5
-rw-r--r--src/kadmin.old/client/Makefile.in12
-rw-r--r--src/kadmin.old/client/configure.in2
3 files changed, 9 insertions, 10 deletions
diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog
index 63c3eadbd..508e7a5a2 100644
--- a/src/kadmin.old/client/ChangeLog
+++ b/src/kadmin.old/client/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 16:03:02 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.
+
Thu Jul 6 17:28:26 1995 Tom Yu <tlyu@lothlorien.MIT.EDU>
* kadmin.c (get_first_ticket): Pass context to os_localaddr.
diff --git a/src/kadmin.old/client/Makefile.in b/src/kadmin.old/client/Makefile.in
index 2b0adb75c..42addc6a1 100644
--- a/src/kadmin.old/client/Makefile.in
+++ b/src/kadmin.old/client/Makefile.in
@@ -1,15 +1,7 @@
CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-SSLIB=$(BUILDTOP)/util/ss/libss.a
-KDBLIB=-lkdb5
all::
-KLIB = -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB)
-
SRCS = \
$(srcdir)/kadmin.c \
$(srcdir)/kadmin_add.c \
@@ -36,8 +28,8 @@ OBJS = \
all:: kadmin
-kadmin: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
- $(LD) $(LDFLAGS) $(LDARGS) -o kadmin $(OBJS) $(KLIB) $(LIBS)
+kadmin: $(OBJS) $(DEPLIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o kadmin $(OBJS) $(LIBS)
install::
$(INSTALL_PROGRAM) $(C)kadmin ${DESTDIR}$(CLIENT_BINDIR)$(S)kadmin_old
diff --git a/src/kadmin.old/client/configure.in b/src/kadmin.old/client/configure.in
index 0c6c8f215..33cebc824 100644
--- a/src/kadmin.old/client/configure.in
+++ b/src/kadmin.old/client/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