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/testing/util | |
| 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/testing/util')
| -rw-r--r-- | src/kadmin/testing/util/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/testing/util/Makefile.in | 18 | ||||
| -rw-r--r-- | src/kadmin/testing/util/configure.in | 12 |
3 files changed, 17 insertions, 18 deletions
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index 698414ab25..f011d939a6 100644 --- a/src/kadmin/testing/util/ChangeLog +++ b/src/kadmin/testing/util/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 5 22:57:53 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Fri Dec 6 00:04:10 1996 Theodore Y. Ts'o <tytso@mit.edu> * test.c: Change test looking for tcl 7.05 and greater to be tcl diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index a650fc37d8..cc58358366 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -1,7 +1,7 @@ -TCLINC=@TCL_INC@ -TCLLIB=@TCL_LIB@ -lm +CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES) -CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCLINC) +PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) +PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH) SRCS = tcl_ovsec_kadm.c tcl_kadm5.c test.c OBJS = tcl_ovsec_kadm.o tcl_kadm5.o test.o @@ -18,14 +18,16 @@ all-:: all-tcl:: $(CLNTPROG) $(SRVPROG) -$(SRVPROG): $(OBJS) $(SRVDEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o $(SRVPROG) $(OBJS) $(SRVLIBS) $(TCLLIB) +$(SRVPROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $(SRVPROG) $(OBJS) \ + $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS) -$(CLNTPROG): $(OBJS) $(CLNTDEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o $(CLNTPROG) $(OBJS) $(CLNTLIBS) $(TCLLIB) +$(CLNTPROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $(CLNTPROG) $(OBJS) \ + $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS) bsddb_dump: bsddb_dump.o - $(LD) $(LDFLAGS) $(LDARGS) -o bsddb_dump bsddb_dump.o $(SRVLIBS) + $(CC_LINK) -o bsddb_dump bsddb_dump.o $(KADMSRV_LIBS) clean:: $(RM) $(CLNTPROG) $(SRVPROG) diff --git a/src/kadmin/testing/util/configure.in b/src/kadmin/testing/util/configure.in index 911c0d6b6e..6c6d32ffdb 100644 --- a/src/kadmin/testing/util/configure.in +++ b/src/kadmin/testing/util/configure.in @@ -3,18 +3,10 @@ CONFIG_RULES AC_PROG_INSTALL dnl Test for tcl AC_KRB5_TCL -if test "$TCL_LIB" != "" ; then +if test "$TCL_LIBS" != "" ; then DO_ALL=tcl fi AC_SUBST(DO_ALL) dnl -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 |