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/slave | |
| 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/slave')
| -rw-r--r-- | src/slave/ChangeLog | 5 | ||||
| -rw-r--r-- | src/slave/Makefile.in | 13 | ||||
| -rw-r--r-- | src/slave/configure.in | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index acaeb8a3d5..f152ec2f7a 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 31 19:22:37 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Thu Dec 5 21:15:27 1996 Tom Yu <tlyu@mit.edu> * kslave_update: Update script for new filename conventions. [PR diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index aba1413fb4..89fd28e4c2 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,6 +1,8 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) -all:: +all:: kprop kpropd CLIENTSRCS= $(srcdir)/kprop.c CLIENTOBJS= kprop.o @@ -10,13 +12,12 @@ SERVEROBJS= kpropd.o SRCS= $(CLIENTSRCS) $(SERVERSRCS) -all:: kprop kpropd -kprop: $(CLIENTOBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o kprop $(CLIENTOBJS) $(LIBS) +kprop: $(CLIENTOBJS) $(KDB5_DEPLIB) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o kprop $(CLIENTOBJS) $(KRB5_BASE_LIBS) -kpropd: $(SERVEROBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o kpropd $(SERVEROBJS) $(LIBS) +kpropd: $(SERVEROBJS) $(KDB5_DEPLIB) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o kpropd $(SERVEROBJS) $(KDB5_LIB) $(KRB5_BASE_LIBS) install:: for f in kprop kpropd; do \ diff --git a/src/slave/configure.in b/src/slave/configure.in index 4f94ea5a77..e65c8d7258 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -3,7 +3,5 @@ CONFIG_RULES AC_PROG_INSTALL AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) AC_CHECK_LIB(util,main) -USE_KDB5_LIBRARY -KRB5_LIBRARIES -V5_USE_SHARED_LIB +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE |