diff options
| author | Paul Park <pjpark@mit.edu> | 1995-07-07 21:09:13 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-07-07 21:09:13 +0000 |
| commit | 350f92f5e097f6d17396536b9710f72ad947710b (patch) | |
| tree | 41eddaa42aedf5de8471f80f7374c1818fdcdd1c /src/slave | |
| parent | ab81876c163e1e06646a78dd1e6ae185b90245bd (diff) | |
| download | krb5-350f92f5e097f6d17396536b9710f72ad947710b.tar.gz krb5-350f92f5e097f6d17396536b9710f72ad947710b.tar.xz krb5-350f92f5e097f6d17396536b9710f72ad947710b.zip | |
Reorganize library logic and use LDFLAGS from configure
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6265 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/slave')
| -rw-r--r-- | src/slave/ChangeLog | 5 | ||||
| -rw-r--r-- | src/slave/Makefile.in | 15 | ||||
| -rw-r--r-- | src/slave/configure.in | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index 14e4ba66c2..710798539c 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,8 @@ + +Fri Jul 7 16:34:36 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. + Wed July 5 15:52:31 1995 James Mattly <mattly@fusion.com> * kprop.c changed open to THREEPARAMOPEN diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 22e6cc67f7..c1b8edf9cc 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,18 +1,7 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -KDBLIB=-lkdb5 - -KLIB = -lkrb5 -lcrypto $(COMERRLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) all:: - - DEPLIBS = $(DEPKLIB) -LOCAL_LIBRARIES = $(KLIB) - CLIENTSRCS= $(srcdir)/kprop.c CLIENTOBJS= kprop.o @@ -24,14 +13,14 @@ SRCS= $(CLIENTSRCS) $(SERVERSRCS) all:: kprop kpropd kprop: $(CLIENTOBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o kprop $(CLIENTOBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kprop $(CLIENTOBJS) $(LIBS) install:: $(INSTALL_PROGRAM) kprop ${DESTDIR}$(SERVER_BINDIR)/kprop $(INSTALL_DATA) $(srcdir)/kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.8 kpropd: $(SERVEROBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o kpropd $(SERVEROBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kpropd $(SERVEROBJS) $(LIBS) install:: $(INSTALL_PROGRAM) kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd diff --git a/src/slave/configure.in b/src/slave/configure.in index 12c9830be6..8c6982bb71 100644 --- a/src/slave/configure.in +++ b/src/slave/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 |