aboutsummaryrefslogtreecommitdiff
path: root/src/appl/sample
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/appl/sample
parent821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff)
downloadkrb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.zip
krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.gz
krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.bz2
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/appl/sample')
-rw-r--r--src/appl/sample/sclient/ChangeLog6
-rw-r--r--src/appl/sample/sclient/Makefile.in4
-rw-r--r--src/appl/sample/sclient/configure.in1
-rw-r--r--src/appl/sample/sserver/ChangeLog6
-rw-r--r--src/appl/sample/sserver/Makefile.in8
-rw-r--r--src/appl/sample/sserver/configure.in1
6 files changed, 20 insertions, 6 deletions
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 596e284..211bf08 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:38:55 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.
+
Sat Jun 10 22:58:15 1995 Tom Yu (tlyu@dragons-lair)
* sclient.c: krb5_auth_context redefinitions
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index d802a33..8651c01 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -5,11 +5,11 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
all::
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
sclient: sclient.o $(DEPKLIB)
- $(CC) $(CFLAGS) -o sclient sclient.o $(KLIB) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(KLIB) $(LIBS)
sclient.o: $(srcdir)/sclient.c
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 93af69e..a7b6a4a 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -1,4 +1,5 @@
AC_INIT(sclient.c)
CONFIG_RULES
AC_PROG_INSTALL
+V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index c91b11f..d6bf4a7 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:39:17 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.
+
Sat Jun 10 22:58:40 1995 Tom Yu (tlyu@dragons-lair)
* sserver.c: krb5_auth_context redefinitions
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index d4ec742..ac59fd3 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,15 +1,15 @@
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KRB5_LOG
LDFLAGS = -g
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
all::
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
sserver: sserver.o $(DEPKLIB)
- $(CC) $(CFLAGS) -o sserver sserver.o $(KLIB) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(KLIB) $(LIBS)
sserver.o: $(srcdir)/sserver.c
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index c8dee12..82a884d 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -1,4 +1,5 @@
AC_INIT(sserver.c)
CONFIG_RULES
AC_PROG_INSTALL
+V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE