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/v5server | |
| 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/v5server')
| -rw-r--r-- | src/kadmin/v5server/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/v5server/Makefile.in | 15 | ||||
| -rw-r--r-- | src/kadmin/v5server/configure.in | 3 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index ae6d217c9..0f8e1c60c 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 16:01:37 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:35:00 EDT 1995 Paul Park (pjpark@mit.edu) * srv_main.c - Instead of moving up the initialization and calls to key_init() before the call to daemon(), have daemon() not diff --git a/src/kadmin/v5server/Makefile.in b/src/kadmin/v5server/Makefile.in index bde3cb18e..ef9efb898 100644 --- a/src/kadmin/v5server/Makefile.in +++ b/src/kadmin/v5server/Makefile.in @@ -1,18 +1,7 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -LDFLAGS = -g - -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 = $(KADMLIB) $(KDBLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) -DEPKLIB = $(DEPKADMLIB) $(DEPKDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) - SRCS = \ $(srcdir)/srv_main.c $(srcdir)/srv_key.c \ $(srcdir)/srv_acl.c $(srcdir)/srv_output.c $(srcdir)/srv_net.c \ @@ -25,8 +14,8 @@ OBJS = \ all:: kadmind5 -kadmind5: $(KDBDEPLIB) $(OBJS) $(DEPKLIB) - $(LD) $(LDFLAGS) $(LDARGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS) +kadmind5: $(OBJS) $(DEPLIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kadmind5 $(OBJS) $(LIBS) install:: $(INSTALL_PROGRAM) $(C)kadmind5 ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind5 diff --git a/src/kadmin/v5server/configure.in b/src/kadmin/v5server/configure.in index ad020ee05..381796717 100644 --- a/src/kadmin/v5server/configure.in +++ b/src/kadmin/v5server/configure.in @@ -22,5 +22,8 @@ else fi AC_SUBST(DBFLAGS)dnl dnl +USE_KADM_LIBRARY +USE_KDB5_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |