From d31d7c3cb0d78f77e2e12215a35efaa7754813e4 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Fri, 19 Sep 2014 15:01:29 -0400 Subject: [PATCH] Build venus tests with libtool This was the only place doing -lafshcrypto_lwp on the command line. (There are other consumers, which list libafshcrypto_lwp.a explicitly; we can use the presence of libafshcrypto_lwp.a to track progress towards not needing a LWP hcrypto build, which must come from the in-tree version.) Convert the tests to build with libtool (as pthreaded), where we can just throw in $(LIB_hcrypto) and deal with what we get. Change-Id: Ibc99615d2ff03b8aebf956502a2a6b1cb26f0a65 Reviewed-on: http://gerrit.openafs.org/11479 Reviewed-by: Benjamin Kaduk Reviewed-by: D Brashear Tested-by: D Brashear --- src/venus/test/Makefile.in | 45 +++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in index 344a06b5e..a6e56bd44 100644 --- a/src/venus/test/Makefile.in +++ b/src/venus/test/Makefile.in @@ -7,30 +7,39 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -include @TOP_OBJDIR@/src/config/Makefile.lwp - - - -INCDIRS= -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I.. -LDIRS= -L${TOP_LIBDIR} -L.. -LIBS= -lsys -lubik -lvldb -lauth -lrxkad -lafshcrypto_lwp \ - -lafscom_err -lcmd -lrx -llwp -lafsutil -lopr \ - $(LIB_roken) $(XLIBS) +include @TOP_OBJDIR@/src/config/Makefile.libtool +include @TOP_OBJDIR@/src/config/Makefile.pthread +top_builddir=@top_builddir@ + +LT_deps = \ + $(TOP_OBJDIR)/src/sys/liboafs_sys.la \ + $(TOP_OBJDIR)/src/ubik/liboafs_ubik.la \ + $(TOP_OBJDIR)/src/vlserver/liboafs_vldb.la \ + $(TOP_OBJDIR)/src/auth/liboafs_auth.la \ + $(TOP_OBJDIR)/src/rxkad/liboafs_rxkad.la \ + $(TOP_OBJDIR)/src/comerr/liboafs_comerr.la \ + $(TOP_OBJDIR)/src/cmd/liboafs_cmd.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) $(LDFLAGS_hcrypto) $(LIB_hcrypto) $(XLIBS) all test: fulltest owntest idtest getinitparams install: dest: -fulltest: fulltest.o - $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) -owntest: owntest.o - $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) -idtest: idtest.o - $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) -getinitparams: getinitparams.o - $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) +fulltest: fulltest.lo + $(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs) +owntest: owntest.lo + $(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs) +idtest: idtest.lo + $(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs) +getinitparams: getinitparams.lo + $(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs) clean: - $(RM) -f *.o fulltest owntest idtest getinitparams + $(LT_CLEAN) + $(RM) -f fulltest owntest idtest getinitparams -- 2.39.5