diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
| commit | 561f2cdd8613f26d7de48c567b603e8c06fe7e5a (patch) | |
| tree | 4165fe26da185697068044d1fba17cb15d5b19bc /src/appl/sample | |
| parent | 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff) | |
| download | krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.gz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.xz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.zip | |
Merge of libhack_branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/sample')
| -rw-r--r-- | src/appl/sample/sclient/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/sample/sclient/Makefile.in | 11 | ||||
| -rw-r--r-- | src/appl/sample/sclient/configure.in | 3 | ||||
| -rw-r--r-- | src/appl/sample/sserver/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/sample/sserver/Makefile.in | 11 | ||||
| -rw-r--r-- | src/appl/sample/sserver/configure.in | 3 |
6 files changed, 20 insertions, 18 deletions
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog index a87734fb7..b8145890b 100644 --- a/src/appl/sample/sclient/ChangeLog +++ b/src/appl/sample/sclient/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 4 20:44:24 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Thu Nov 7 15:25:03 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> * sclient.c (argv): Check the error return from diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index 40587b20e..8763029a8 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -1,14 +1,11 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) - -all:: - -sclient: sclient.o $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(LIBS) - -sclient.o: $(srcdir)/sclient.c +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) all:: sclient +sclient: sclient.o $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o sclient sclient.o $(KRB5_BASE_LIBS) clean:: $(RM) sclient.o sclient diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in index 3683371e7..0a1fcf4b2 100644 --- a/src/appl/sample/sclient/configure.in +++ b/src/appl/sample/sclient/configure.in @@ -2,6 +2,5 @@ AC_INIT(sclient.c) CONFIG_RULES AC_PROG_INSTALL AC_CHECK_HEADERS(stdlib.h) -KRB5_LIBRARIES -V5_USE_SHARED_LIB +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog index be41b716c..591aef56d 100644 --- a/src/appl/sample/sserver/ChangeLog +++ b/src/appl/sample/sserver/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 4 20:47:55 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Thu Dec 5 19:44:05 1996 Tom Yu <tlyu@mit.edu> * sserver.M: remove ref's to "/krb5" [PR 279] diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index 84e6a0e58..5be42c28a 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -1,14 +1,11 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) - -all:: - -sserver: sserver.o $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(LIBS) - -sserver.o: $(srcdir)/sserver.c +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) all:: sserver +sserver: sserver.o $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o sserver sserver.o $(KRB5_BASE_LIBS) clean:: $(RM) sserver.o sserver diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in index 8496e5e53..af0f45a26 100644 --- a/src/appl/sample/sserver/configure.in +++ b/src/appl/sample/sserver/configure.in @@ -1,6 +1,5 @@ AC_INIT(sserver.c) CONFIG_RULES AC_PROG_INSTALL -KRB5_LIBRARIES -V5_USE_SHARED_LIB +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE |