From ed62dea466ccc491e7d0f31abcc565afe45c8f7c Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 5 May 2004 01:19:43 +0000 Subject: [PATCH] * configure.in: Enable dependency support for shared lib. * Makefile.in (test_et, t_com_err): Depend on, and link against, the new support library. (SHLIB_EXPDEPS, SHLIB_EXPLIBS, SHLIB_RDIRS, SHLIB_DIRS): New variables. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16308 dc483132-0cff-0310-8789-dd5450dbe970 --- src/util/et/ChangeLog | 6 ++++++ src/util/et/Makefile.in | 12 ++++++++---- src/util/et/configure.in | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index f60d97742..1209177fa 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -7,6 +7,12 @@ (check-unix): Set up the environment properly to load shared libraries when running the test programs. + * configure.in: Enable dependency support for shared lib. + * Makefile.in (test_et, t_com_err): Depend on, and link against, + the new support library. + (SHLIB_EXPDEPS, SHLIB_EXPLIBS, SHLIB_RDIRS, SHLIB_DIRS): New + variables. + 2004-04-29 Ken Raeburn * Makefile.in (LIBINITFUNC, LIBFINIFUNC): New variables. diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index 1aa4887be..c97547fef 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -62,8 +62,12 @@ WFLAGS= -ansi -D_POSIX_SOURCE -pedantic \ DEPLIBS= SHLIB_LIBS= +SHLIB_EXPDEPS = $(SUPPORT_DEPLIB) +SHLIB_EXPLIBS=-l$(SUPPORT_LIBNAME) SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ +SHLIB_RDIRS=$(KRB5_LIBDIR) +SHLIB_DIRS=-L$(TOPLIBD) COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h @@ -127,10 +131,10 @@ do-its4: error_table.y et_lex.lex.c PROG_RPATH=$(KRB5_LIBDIR) PROG_LIBPATH=-L$(TOPLIBD) -test_et: test_et.o test1.o test2.o $(COM_ERR_DEPLIB) - $(CC_LINK) -o test_et test_et.o test1.o test2.o -lcom_err -t_com_err: t_com_err.o et1.o et2.o $(COM_ERR_DEPLIB) - $(CC_LINK) -o t_com_err t_com_err.o et1.o et2.o -lcom_err +test_et: test_et.o test1.o test2.o $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o test_et test_et.o test1.o test2.o -lcom_err $(SUPPORT_LIB) +t_com_err: t_com_err.o et1.o et2.o $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_com_err t_com_err.o et1.o et2.o -lcom_err $(SUPPORT_LIB) all-unix:: compile_et includes diff --git a/src/util/et/configure.in b/src/util/et/configure.in index b444b5f99..6839f38d0 100644 --- a/src/util/et/configure.in +++ b/src/util/et/configure.in @@ -21,7 +21,7 @@ AC_CHECK_FUNCS(strerror) AC_HEADER_STDARG AC_CHECK_HEADERS(stdlib.h) KRB5_BUILD_LIBOBJS -KRB5_BUILD_LIBRARY +KRB5_BUILD_LIBRARY_WITH_DEPS KRB5_BUILD_PROGRAM dnl for test programs KRB5_RUN_FLAGS dnl for test programs V5_AC_OUTPUT_MAKEFILE -- 2.26.2