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/krb524 | |
| 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/krb524')
| -rw-r--r-- | src/krb524/ChangeLog | 5 | ||||
| -rw-r--r-- | src/krb524/Makefile.in | 25 | ||||
| -rw-r--r-- | src/krb524/configure.in | 3 |
3 files changed, 16 insertions, 17 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index f770c7900..42e7869ec 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 16:07:21 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:38:56 EDT 1995 Paul Park (pjpark@mit.edu) * configure.in - Add --with-dbm to select between Berkeley and DBM KDC database format. diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index fcfa14074..03805ab00 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -21,21 +21,12 @@ # $Id$ CFLAGS = $(CCOPTS) -DUSE_MASTER $(DEFS) $(LOCALINCLUDE) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a all:: -KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ - -KDBLIB=-lkdb5 -KDBDEPLIB=$(TOPLIBD)/libkdb5.a -KLIB = libkrb524.a -lkrb5 $(KRB4_LIB) -lcrypto \ - $(COMERRLIB) -DEPKLIB = libkrb524.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a \ - $(COMERRLIB) +LOCAL_LIBRARIES = libkrb524.a +DEPLOCAL_LIBRARIES = libkrb524.a LOCALINCLUDE= -I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV \ -I. -I$(srcdir) @@ -54,14 +45,14 @@ libkrb524.a: $(OBJS) $(ARADD) $@ $(OBJS) $(RANLIB) $@ -test: libkrb524.a test.o $(DEPKDBLIB) $(DEPKLIB) - $(LD) -o test $(LDFLAGS) $(LDARGS) test.o $(KDBLIB) $(KLIB) $(LIBS) +test: libkrb524.a test.o $(DEPLIBS) + $(LD) -o test $(LDFLAGS) $(LDARGS) test.o $(LIBS) -krb524d: libkrb524.a krb524d.o $(DEPKDBLIB) $(DEPKLIB) - $(LD) -o krb524d krb524d.o $(LDFLAGS) $(LDARGS) $(KDBLIB) $(KLIB) $(LIBS) +krb524d: krb524d.o $(DEPLIBS) + $(LD) -o krb524d krb524d.o $(LDFLAGS) $(LDARGS) $(LIBS) -k524init: libkrb524.a k524init.o $(DEPKLIB) - $(LD) -o k524init $(LDFLAGS) $(LDARGS) k524init.o $(KLIB) $(LIBS) +k524init: k524init.o $(DEPLIBS) + $(LD) -o k524init $(LDFLAGS) $(LDARGS) k524init.o $(LIBS) install:: $(INSTALL_DATA) libkrb524.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb524.a diff --git a/src/krb524/configure.in b/src/krb524/configure.in index d39b4baab..916e09560 100644 --- a/src/krb524/configure.in +++ b/src/krb524/configure.in @@ -20,5 +20,8 @@ else fi AC_SUBST(DBFLAGS)dnl dnl +USE_KDB5_LIBRARY +USE_KRB4_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |