Merge of libhack_branch

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 22 insertions, 20 deletions

diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index db1136c43a..9deae0cc6a 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:38:44 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:48:30 1996  unknown  <bjaspan@mit.edu>
 
 	* sim_client.c (main): use sizeof instead of h_length to determine
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 0424a3ee4d..f9f530322a 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,19 +1,16 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-all::
+all:: sim_client
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
-sim_client: sim_client.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(LIBS)
-
-sim_client.o:	$(srcdir)/sim_client.c
-
-all:: sim_client
+sim_client: sim_client.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o sim_client sim_client.o $(KRB5_BASE_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) sim_client $(DESTDIR)$(CLIENT_BINDIR)/sim_client
 
 clean::
 	$(RM) sim_client.o sim_client
-
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
index a942368495..3d81282e82 100644
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/configure.in
@@ -5,6 +5,5 @@ AC_CHECK_HEADERS(stdlib.h)
 if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then
 	AC_DEFINE(BROKEN_STREAMS_SOCKETS)
 fi
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 6e30ce4a4c..dd7e1e1462 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:41:49 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:48:42 1996  unknown  <bjaspan@mit.edu>
 
 	* sim_server.c (argv): use sizeof instead of h_length to determine
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index bd8a413172..332c2660e8 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -2,19 +2,16 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
-all::
-
-sim_server: sim_server.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(LIBS)
-
-sim_server.o:	$(srcdir)/sim_server.c
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sim_server
 
+sim_server: sim_server.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o sim_server sim_server.o $(KRB5_BASE_LIBS)
+
 install::
 	$(INSTALL_PROGRAM) sim_server $(DESTDIR)$(SERVER_BINDIR)/sim_server
 
-
 clean::
 	$(RM) sim_server.o sim_server
-
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
index f754694566..61590e6e9a 100644
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(sim_server.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE