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/kadmin/v5client | |
| 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/kadmin/v5client')
| -rw-r--r-- | src/kadmin/v5client/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/v5client/Makefile.in | 16 | ||||
| -rw-r--r-- | src/kadmin/v5client/configure.in | 5 |
3 files changed, 11 insertions, 15 deletions
diff --git a/src/kadmin/v5client/ChangeLog b/src/kadmin/v5client/ChangeLog index f1af638ee1..c94731af77 100644 --- a/src/kadmin/v5client/ChangeLog +++ b/src/kadmin/v5client/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 16:00:34 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove all explicit library handling and LDFLAGS. + * configure.in - Add USE_<mumble> and KRB5_LIBRARIES. + + Fri Jun 30 14:33:31 EDT 1995 Paul Park (pjpark@mit.edu) * kadmin5.c - Add usage of compile(3) regular expression interfaces if present. Also call regfree if using regcomp. diff --git a/src/kadmin/v5client/Makefile.in b/src/kadmin/v5client/Makefile.in index 92ae11e263..50bac0f92e 100644 --- a/src/kadmin/v5client/Makefile.in +++ b/src/kadmin/v5client/Makefile.in @@ -1,21 +1,7 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -LDFLAGS = - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -SSLIB=$(BUILDTOP)/util/ss/libss.a -KDBLIB=-lkdb5 -DEPKDBLIB=$(TOPLIBD)/libkdb5.a -KADMLIB=-lkadm -DEPKADMLIB=$(TOPLIBD)/libkadm.a all:: -KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(SSLIB) $(COMERRLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) - - -DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) $(DEPKADMLIB) -LOCAL_LIBRARIES = $(KDBLIB) $(KADMLIB) $(KLIB) LOCALINCLUDE= OBJS= kadmin5.o \ @@ -32,7 +18,7 @@ SRCS= $(srcdir)/kadmin5.c \ all:: kadmin5 kadmin5: kadmin5.o $(DEPLIBS) $(OBJS) - $(LD) $(LDFLAGS) $(LDARGS) -o kadmin5 $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kadmin5 $(OBJS) $(LIBS) install:: $(INSTALL_PROGRAM) kadmin5 ${DESTDIR}$(ADMIN_BINDIR)/kadmin5 diff --git a/src/kadmin/v5client/configure.in b/src/kadmin/v5client/configure.in index e8dab2ab4b..0815bbd422 100644 --- a/src/kadmin/v5client/configure.in +++ b/src/kadmin/v5client/configure.in @@ -20,5 +20,10 @@ else fi AC_SUBST(DBFLAGS)dnl dnl +USE_KADM_LIBRARY +USE_KDB5_LIBRARY +USE_KRB4_LIBRARY +USE_SS_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |