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/kadmin/cli | |
| 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/kadmin/cli')
| -rw-r--r-- | src/kadmin/cli/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/cli/Makefile.in | 10 | ||||
| -rw-r--r-- | src/kadmin/cli/configure.in | 10 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index db41039873..2847e9fee3 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 4 20:56:47 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Tue Dec 17 17:08:04 1996 Ezra Peisach <epeisach@mit.edu> * kadmin.c (kadmin_startup): Do not compare an int to NULL. diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index e7d6ac1b96..73a13f095a 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -1,15 +1,17 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) PROG = kadmin OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o keytab.o all:: $(PROG).local $(PROG) -$(PROG).local: $(OBJS) $(SRVDEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o $(PROG).local $(OBJS) $(SRVLIBS) +$(PROG).local: $(OBJS) $(SS_DEPLIB) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $(PROG).local $(OBJS) $(SS_LIB) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) -$(PROG): $(OBJS) $(CLNTDEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(CLNTLIBS) +$(PROG): $(OBJS) $(SS_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $(PROG) $(OBJS) $(SS_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) kadmin_ct.o: kadmin_ct.c diff --git a/src/kadmin/cli/configure.in b/src/kadmin/cli/configure.in index c76b7690e8..d843fc37e8 100644 --- a/src/kadmin/cli/configure.in +++ b/src/kadmin/cli/configure.in @@ -5,13 +5,5 @@ AC_PROG_YACC AC_HAVE_HEADERS(unistd.h sys/timeb.h alloca.h) AC_HAVE_FUNCS(ftime timezone) AC_REPLACE_FUNCS([memmove strftime]) -USE_KADMCLNT_LIBRARY -USE_GSSAPI_LIBRARY -USE_KADMSRV_LIBRARY -USE_GSSRPC_LIBRARY -USE_DYN_LIBRARY -USE_KDB5_LIBRARY -USE_SS_LIBRARY -V5_USE_SHARED_LIB -KRB5_LIBRARIES +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE |