summaryrefslogtreecommitdiffstats
path: root/src/admin
diff options
context:
space:
mode:
authorPaul Park <pjpark@mit.edu>1995-06-15 22:34:56 +0000
committerPaul Park <pjpark@mit.edu>1995-06-15 22:34:56 +0000
commitb3e348a072ba88a2ae1b28ed58dc0b5249b9cb91 (patch)
tree40f4f5b31ddbca1f791d2f080e3da04cf3bcc109 /src/admin
parent821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff)
downloadkrb5-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')
-rw-r--r--src/admin/aname/ChangeLog6
-rw-r--r--src/admin/aname/Makefile.in6
-rw-r--r--src/admin/aname/configure.in1
-rw-r--r--src/admin/convert/ChangeLog8
-rw-r--r--src/admin/convert/Makefile.in8
-rw-r--r--src/admin/convert/configure.in1
-rw-r--r--src/admin/create/ChangeLog9
-rw-r--r--src/admin/create/Makefile.in9
-rw-r--r--src/admin/create/configure.in3
-rw-r--r--src/admin/destroy/ChangeLog9
-rw-r--r--src/admin/destroy/Makefile.in9
-rw-r--r--src/admin/destroy/configure.in3
-rw-r--r--src/admin/edit/ChangeLog8
-rw-r--r--src/admin/edit/Makefile.in9
-rw-r--r--src/admin/edit/configure.in1
-rw-r--r--src/admin/stash/ChangeLog6
-rw-r--r--src/admin/stash/Makefile.in9
-rw-r--r--src/admin/stash/configure.in3
18 files changed, 75 insertions, 33 deletions
diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog
index ab3207c27d..fdfbfc1a3c 100644
--- a/src/admin/aname/ChangeLog
+++ b/src/admin/aname/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 15:22:33 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.
+ * configure.in - Add shared library usage check.
+
Fri Jun 9 18:13:43 1995 <tytso@rsx-11.mit.edu>
* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 0f418e93cc..cb607a9276 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -3,12 +3,12 @@ LDFLAGS = -g
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a
+KDBLIB=-lkdb5
DEPKDBLIB=$(TOPLIBD)/libkdb5.a
all::
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB) $(DBMLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
@@ -18,7 +18,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
all:: kdb5_anadd
kdb5_anadd: kdb5_anadd.o $(DEPLIBS)
- $(CC) $(CFLAGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS)
install::
$(INSTALL_PROGRAM) kdb5_anadd $(DESTDIR)$(ADMIN_BINDIR)/kdb5_anadd
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 9d79e40b2b..630bb2361e 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -3,4 +3,5 @@ CONFIG_RULES
AC_PROG_INSTALL
AC_CHECK_LIB(ndbm,main)
AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index f906781266..406bb5bb0a 100644
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,3 +1,11 @@
+
+Thu Jun 15 15:27:36 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:06 1995 <tytso@rsx-11.mit.edu>
* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index 78f8200b95..f236098058 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/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)
@@ -6,12 +6,12 @@ LDFLAGS = -g
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a
+KDBLIB=-lkdb5
DEPKDBLIB=$(TOPLIBD)/libkdb5.a
all::
-KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
@@ -22,7 +22,7 @@ LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
all:: kdb5_convert
kdb5_convert: kdb5_convert.o $(DEPLIBS)
- $(CC) $(CFLAGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS)
install::
$(INSTALL_PROGRAM) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 31197bd2c7..77b90e890c 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -3,4 +3,5 @@ CONFIG_RULES
AC_PROG_INSTALL
AC_CHECK_LIB(ndbm,main)
AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index 282021fe50..45d5773ca5 100644
--- a/src/admin/create/ChangeLog
+++ b/src/admin/create/ChangeLog
@@ -1,3 +1,12 @@
+
+Thu Jun 15 15:29:39 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, remove DBMLIB, it wasn't used.
+ * configure.in - Remove checks for dbm, they are not needed any
+ more with the Berkeley database code. Add shared library
+ usage check.
+
Fri Jun 9 18:14:21 1995 <tytso@rsx-11.mit.edu>
* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in
index ac7658fa1e..3491d9ffe6 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a
+KDBLIB=-lkdb5
DEPKDBLIB=$(TOPLIBD)/libkdb5.a
all::
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
@@ -18,7 +17,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
all:: kdb5_create
kdb5_create: kdb5_create.o $(DEPLIBS)
- $(CC) $(CFLAGS) -o kdb5_create kdb5_create.o $(LOCAL_LIBRARIES) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_create kdb5_create.o $(LOCAL_LIBRARIES) $(LIBS)
install::
$(INSTALL_PROGRAM) kdb5_create $(DESTDIR)$(ADMIN_BINDIR)/kdb5_create
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index e2115c6e05..f5524a2687 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -1,6 +1,5 @@
AC_INIT(kdb5_create.c)
CONFIG_RULES
AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
index 7812b968b7..64357597d9 100644
--- a/src/admin/destroy/ChangeLog
+++ b/src/admin/destroy/ChangeLog
@@ -1,4 +1,13 @@
+Thu Jun 15 15:31: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, remove DBMLIB, it was not used.
+ * configure.in - Remove dbm library checks, these are no longer needed
+ with the Berkeley database code. Also, add shared library
+ usage check.
+
+
Tue May 30 14:41:50 EDT 1995 Paul Park (pjpark@mit.edu)
* kdb5_destroy.c: Remove knowledge of database files. Use kdb5_db_
destroy to destroy the database.
diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index 01303acab6..05770f3504 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a
+KDBLIB=-lkdb5
DEPKDBLIB=$(TOPLIBD)/libkdb5.a
all::
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
@@ -18,7 +17,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
all:: kdb5_destroy
kdb5_destroy: kdb5_destroy.o $(DEPLIBS)
- $(CC) $(CFLAGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS)
install::
$(INSTALL_PROGRAM) kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index 92792cc896..898b67832d 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -1,6 +1,5 @@
AC_INIT(kdb5_destroy.c)
CONFIG_RULES
AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 9e82a37b8d..ca2ffa1f46 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 a8859cc145..9b53cb6aca 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 e2f9bb0757..92b929e712 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
diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
index 976ea9a2bb..26ef17e294 100644
--- a/src/admin/stash/ChangeLog
+++ b/src/admin/stash/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 15:35:39 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.
+ * configure.in - Add shared library usage check.
+
Fri Jun 9 18:16:17 1995 <tytso@rsx-11.mit.edu>
* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index 952141261a..0ccbee0a81 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a
+KDBLIB=-lkdb5
DEPKDBLIB=$(TOPLIBD)/libkdb5.a
all::
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
@@ -18,7 +17,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
all:: kdb5_stash
kdb5_stash: kdb5_stash.o $(DEPLIBS)
- $(CC) $(CFLAGS) -o kdb5_stash kdb5_stash.o $(LOCAL_LIBRARIES) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_stash kdb5_stash.o $(LOCAL_LIBRARIES) $(LIBS)
install::
$(INSTALL_PROGRAM) kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index d8b4a565b2..e709120f93 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -1,6 +1,5 @@
AC_INIT(kdb5_stash.c)
CONFIG_RULES
AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
generated by cgit (git 2.34.1) at 2024-09-30 09:30:19 +0000