diff options
| author | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
| commit | b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91 (patch) | |
| tree | 40f4f5b31ddbca1f791d2f080e3da04cf3bcc109 /src/admin/edit | |
| parent | 821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff) | |
| download | krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.gz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.xz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.zip | |
Shared library Makefile/configure changes and cleanup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6069 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin/edit')
| -rw-r--r-- | src/admin/edit/ChangeLog | 8 | ||||
| -rw-r--r-- | src/admin/edit/Makefile.in | 9 | ||||
| -rw-r--r-- | src/admin/edit/configure.in | 1 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog index 9e82a37b8..ca2ffa1f4 100644 --- a/src/admin/edit/ChangeLog +++ b/src/admin/edit/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 15:34:59 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, for K4, use KRB4_LIB and KRB4_CRYPTO_LIB, these wer + split out. + * configure.in - Add shared library usage check. + Fri Jun 9 18:14:43 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in index a8859cc14..9b53cb6ac 100644 --- a/src/admin/edit/Makefile.in +++ b/src/admin/edit/Makefile.in @@ -1,4 +1,4 @@ -KRB4_LIB = @KRB4_LIB@ +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ KDB4_LIB = @KDB4_LIB@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g @@ -6,15 +6,14 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(SSLIB) $(COMERRLIB) $(DBMLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) - DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) LOCAL_LIBRARIES = $(KDBLIB) $(KDB4_LIB) $(KLIB) LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV @@ -39,7 +38,7 @@ SRCS= $(srcdir)/kdb5_edit.c \ all:: kdb5_edit kdb5_edit: kdb5_edit.o $(DEPLIBS) $(OBJS) - $(CC) $(CFLAGS) -o kdb5_edit $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_edit $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) getdate.c getdate.h: getdate.y $(RM) getdate.c getdate.h y.tab.* diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index e2f9bb075..92b929e71 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -10,4 +10,5 @@ AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) AC_HAVE_FUNCS(getcwd) SS_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |