From 933d980341556f776a500b41f12a86854bdd41a2 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Tue, 23 Sep 2014 15:33:08 -0400 Subject: [PATCH 1/1] Build auth tests with libtool (And pthreaded.) This was the only place consuming librokenafs directly, which is forbidden if we are to properly support using an external roken. Convert to libtool and throw $(LIB_roken) on at the end. Change-Id: I0cdea690800be1022888244b613929ce3154db1d Reviewed-on: http://gerrit.openafs.org/11476 Reviewed-by: Benjamin Kaduk Reviewed-by: D Brashear Tested-by: D Brashear --- src/auth/test/Makefile.in | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/auth/test/Makefile.in b/src/auth/test/Makefile.in index 4b24146..f45f530 100644 --- a/src/auth/test/Makefile.in +++ b/src/auth/test/Makefile.in @@ -7,23 +7,27 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -include @TOP_OBJDIR@/src/config/Makefile.lwp +include @TOP_OBJDIR@/src/config/Makefile.pthread - -LIBS= ../libauth.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ - ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS} \ - $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/librokenafs.a +LT_deps = \ + $(TOP_OBJDIR)/src/auth/liboafs_auth.la \ + $(TOP_OBJDIR)/src/sys/liboafs_sys.la \ + $(TOP_OBJDIR)/src/rx/liboafs_rx.la \ + $(TOP_OBJDIR)/src/util/liboafs_util.la \ + $(TOP_OBJDIR)/src/opr/liboafs_opr.la +LT_libs = $(LDFLAGS_roken) $(LIB_roken) tests all: testcellconf ktctest -testcellconf: testcellconf.o - $(AFS_LDRULE) testcellconf.o ${LIBS} +testcellconf: testcellconf.lo + $(LT_LDRULE_static) testcellconf.lo $(LT_deps) $(LT_libs) -ktctest: ktctest.o - $(AFS_LDRULE) ktctest.o ${LIBS} +ktctest: ktctest.lo + $(LT_LDRULE_static) ktctest.lo $(LT_deps) $(LT_libs) clean: - $(RM) -f *.o *.a copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core + $(LT_CLEAN) + $(RM) -f copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core install: -- 1.9.4