aboutsummaryrefslogtreecommitdiff
path: root/src/appl/sample
diff options
context:
space:
mode:
authorPaul Park <pjpark@mit.edu>1995-07-07 20:58:36 +0000
committerPaul Park <pjpark@mit.edu>1995-07-07 20:58:36 +0000
commitf5feac72367bbaf855c57696036063ef150ce9b2 (patch)
treed9ebac64d0e6562ab56863ae0d0437010d6e17b8 /src/appl/sample
parent0e6ce6fec56ac88099d08622864877f923b84163 (diff)
downloadkrb5-f5feac72367bbaf855c57696036063ef150ce9b2.zip
krb5-f5feac72367bbaf855c57696036063ef150ce9b2.tar.gz
krb5-f5feac72367bbaf855c57696036063ef150ce9b2.tar.bz2
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/appl/sample')
-rw-r--r--src/appl/sample/sclient/ChangeLog5
-rw-r--r--src/appl/sample/sclient/Makefile.in10
-rw-r--r--src/appl/sample/sclient/configure.in1
-rw-r--r--src/appl/sample/sserver/ChangeLog5
-rw-r--r--src/appl/sample/sserver/Makefile.in10
-rw-r--r--src/appl/sample/sserver/configure.in2
6 files changed, 17 insertions, 16 deletions
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 435b8fc..b464583 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:46:11 EDT 1995 Paul Park (pjpark@mit.edu)
+ * Makefile.in - Remove all explicit library handling and LDFLAGS.
+ * configure.in - Add KRB5_LIBRARIES.
+
Tue Jun 20 13:16:10 1995 Tom Yu (tlyu@dragons-lair)
* configure.in: added missing check for stdlib.h
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 8651c01..40587b2 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,15 +1,9 @@
CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
all::
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-sclient: sclient.o $(DEPKLIB)
- $(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(KLIB) $(LIBS)
+sclient: sclient.o $(DEPLIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(LIBS)
sclient.o: $(srcdir)/sclient.c
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 02ecb65..3683371 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -2,5 +2,6 @@ AC_INIT(sclient.c)
CONFIG_RULES
AC_PROG_INSTALL
AC_CHECK_HEADERS(stdlib.h)
+KRB5_LIBRARIES
V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index d6bf4a7..bee2417 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,4 +1,9 @@
+Fri Jul 7 15:47:04 EDT 1995 Paul Park (pjpark@mit.edu)
+ * Makefile.in - Remove all explicit library handling and LDFLAGS.
+ * configure.in - Add KRB5_LIBRARIES and USE_KADM_LIBRARY.
+
+
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.
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 92eb2cd..84e6a0e 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,15 +1,9 @@
CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
all::
-KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-sserver: sserver.o $(DEPKLIB)
- $(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(KLIB) $(LIBS)
+sserver: sserver.o $(DEPLIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(LIBS)
sserver.o: $(srcdir)/sserver.c
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index 82a884d..c0089c3 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -1,5 +1,7 @@
AC_INIT(sserver.c)
CONFIG_RULES
AC_PROG_INSTALL
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE