From 9ed998275cae289be7403717d9c6181c42196164 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 28 Aug 2012 08:18:45 +0100 Subject: [PATCH] vlserver: Use libtool Change-Id: I030ec62db64b6dab856d520e68d5d727cd7b8bb3 Reviewed-on: http://gerrit.openafs.org/8093 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/dviced/Makefile.in | 13 ++----------- src/dvolser/Makefile.in | 12 ------------ src/tvlserver/Makefile.in | 28 ++++++++-------------------- src/venus/Makefile.in | 9 +++------ src/viced/Makefile.in | 12 +----------- src/vlserver/Makefile.in | 29 +++++++++++++++++++---------- src/vlserver/liboafs_vldb.la.sym | 30 ++++++++++++++++++++++++++++++ 7 files changed, 63 insertions(+), 70 deletions(-) create mode 100644 src/vlserver/liboafs_vldb.la.sym diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in index bbb96acc5..c0ed38c08 100644 --- a/src/dviced/Makefile.in +++ b/src/dviced/Makefile.in @@ -23,8 +23,6 @@ VOL=$(srcdir)/../vol VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o \ fsstats.o -VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o - DIROBJS=buffer.o dir.o salvage.o VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \ @@ -33,8 +31,7 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \ FSINTOBJS= afsint.ss.o -objects= ${VICEDOBJS} ${VLSERVEROBJS} \ - ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} +objects= ${VICEDOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} SDBGOBJS = state_analyzer.o \ $(top_builddir)/src/util/liboafs_util.la \ @@ -42,6 +39,7 @@ SDBGOBJS = state_analyzer.o \ LIBS=${TOP_LIBDIR}/libafsauthent.a \ $(top_builddir)/src/sys/liboafs_sys.la \ + $(top_builddir)/src/vlserver/liboafs_vldb.la \ $(top_builddir)/src/libacl/liboafs_acl.la \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/rxstat/liboafs_rxstat.la \ @@ -74,13 +72,6 @@ fsstats.o: ${VICED}/fsstats.c serialize_state.o: ${VICED}/serialize_state.c $(AFS_CCRULE) $(VICED)/serialize_state.c -vldbint.cs.o: ../vlserver/vldbint.cs.c - $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c - -vldbint.xdr.o: ../vlserver/vldbint.xdr.c - $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c - - buffer.o: ${DIR}/buffer.c $(AFS_CCRULE) $(DIR)/buffer.c diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in index 8e2c85724..87c1dcb34 100644 --- a/src/dvolser/Makefile.in +++ b/src/dvolser/Makefile.in @@ -13,15 +13,12 @@ HELPER_SPLINT=@HELPER_SPLINT@ MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS -VLSERVER=$(srcdir)/../vlserver DIR=$(srcdir)/../dir VOL=$(srcdir)/../vol VOLSER=$(srcdir)/../volser VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vscommon.o vol_split.o -VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o - DIROBJS=buffer.o dir.o salvage.o VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \ @@ -83,15 +80,6 @@ vsutils.o: ${VOLSER}/vsutils.c lockprocs.o: ${VOLSER}/lockprocs.c $(AFS_CCRULE) $(VOLSER)/lockprocs.c -vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h - $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver - -vldbint.cs.o: ../vlserver/vldbint.cs.c - $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c - -vldbint.xdr.o: ../vlserver/vldbint.xdr.c - $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c - buffer.o: ${DIR}/buffer.c $(AFS_CCRULE) $(DIR)/buffer.c diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index e460cd748..52655dfd6 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -35,18 +35,17 @@ LIBS_common = \ $(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/opr/liboafs_opr.la -LIBS_server = \ +LIBS_server= \ + $(top_builddir)/src/rxstat/liboafs_rxstat.la \ $(top_builddir)/src/audit/liboafs_audit.la \ $(LIBS_common) -LIBS_client = \ +LIBS_client= \ + $(top_builddir)/src/vlserver/liboafs_vldb.la \ $(LIBS_common) -OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o - all: \ - vlserver vlclient vlserver cnvldb vldb_check \ - Kvldbint.cs.c Kvldbint.xdr.c vldbint.h + vlserver vlclient vlserver cnvldb vldb_check vldbint.h depinstall: @@ -54,7 +53,6 @@ depinstall: # Other stuff # - vldb_check: vldb_check.o AFS_component_version_number.o $(LIBS_client) $(LT_LDRULE_static) vldb_check.o AFS_component_version_number.o \ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} @@ -91,11 +89,8 @@ vlprocs.o: ${VLSERVER}/vlprocs.c ${INCLS} $(AFS_CCRULE) $(VLSERVER)/vlprocs.c vldbint.ss.o: vldbint.ss.c -vldbint.cs.o: vldbint.cs.c vldbint.xdr.o: vldbint.xdr.c -vldbint.cs.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -u -x -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg vldbint.ss.c: ${VLSERVER}/vldbint.xg ${RXGEN} -A -x -S -o $@ ${srcdir}/${VLSERVER}/vldbint.xg @@ -106,19 +101,12 @@ vldbint.xdr.c: ${VLSERVER}/vldbint.xg vldbint.h: ${VLSERVER}/vldbint.xg ${RXGEN} -A -u -x -h -o $@ ${srcdir}/${VLSERVER}/vldbint.xg -vldbint.cs.c: vldbint.h vldbint.ss.c: vldbint.h vldbint.xdr.c: vldbint.h -Kvldbint.cs.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -x -k -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg - -Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg - -vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS} - $(LT_LDRULE_static) vlclient.o $(OBJS) \ - $(LIBS_server) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} +vlclient: vlclient.o $(LIBS_client) + $(LT_LDRULE_static) vlclient.o $(LIBS_client) \ + $(LIB_roken) ${MT_LIBS} ${XLIBS} vlclient.o: ${VLSERVER}/vlclient.c $(AFS_CCRULE) $(VLSERVER)/vlclient.c diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index fc60ccbe2..31fb07ec2 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -28,6 +28,7 @@ AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \ ${TOP_LIBDIR}/libafsauthent.a \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/fsint/liboafs_fsint.la \ + $(top_builddir)/src/vlserver/liboafs_vldb.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/opr/liboafs_opr.la @@ -87,15 +88,11 @@ fs: fs.o $(LIBS) afsio.o: afsio.c ${AFSIO_INCLS} AFS_component_version_number.c ${PTH_CCRULE} ${srcdir}/afsio.c -vldbint.cs.o: ../vlserver/vldbint.cs.c - ${PTH_CCRULE} ../vlserver/vldbint.cs.c -vldbint.xdr.o: ../vlserver/vldbint.xdr.c - ${PTH_CCRULE} ../vlserver/vldbint.xdr.c afscbint.ss.o: ../fsint/afscbint.ss.c ${PTH_CCRULE} ../fsint/afscbint.ss.c -afsio: afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS} - $(LT_LDRULE_static) afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o \ +afsio: afsio.o afscbint.ss.o ${AFSIO_LIBS} + $(LT_LDRULE_static) afsio.o afscbint.ss.o \ ${AFSIO_LIBS} \ $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} \ $(LDFLAGS_krb5) $(LIB_krb5) diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 82eae10f1..4d0cbc19d 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -14,15 +14,12 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread MODULE_CFLAGS = -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT -VLSERVER=$(srcdir)/../vlserver DIR=$(srcdir)/../dir VOL=$(srcdir)/../vol VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o \ fsstats.o -VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o - DIROBJS=buffer.o dir.o salvage.o VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \ @@ -31,7 +28,7 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \ FSINTOBJS = afsint.ss.o -objects= ${VICEDOBJS} ${VLSERVEROBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} +objects= ${VICEDOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} LIBS=${TOP_LIBDIR}/libafsauthent.a \ $(top_builddir)/src/sys/liboafs_sys.la \ @@ -66,13 +63,6 @@ cbd.o: callback.c AFS_component_version_number.c cbd: cbd.o $(LT_LDRULE_static) cbd.o ${LIBS} $(LIB_roken) ${XLIBS} -vldbint.cs.o: ../vlserver/vldbint.cs.c - $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c - -vldbint.xdr.o: ../vlserver/vldbint.xdr.c - $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c - - buffer.o: ${DIR}/buffer.c $(AFS_CCRULE) $(DIR)/buffer.c diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 0f78c7ae3..cfc212e1e 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -7,6 +7,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.libtool include @TOP_OBJDIR@/src/config/Makefile.lwp ENABLE_PTHREADED_UBIK = @ENABLE_PTHREADED_UBIK@ @@ -21,6 +22,7 @@ INCLS=${TOP_INCDIR}/ubik.h \ vlserver.h vldbint.h LIBS=\ + $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a \ @@ -35,13 +37,17 @@ LIBS=\ $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a -OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o +LT_objs = vldbint.xdr.lo vldbint.cs.lo vl_errors.lo \ + AFS_component_version_number.lo +LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \ + $(top_builddir)/src/rx/liboafs_rx.la \ + $(top_builddir)/src/ubik/liboafs_ubik.la all: \ vlserver vlclient cnvldb vlserver cnvldb vldb_check \ Kvldbint.cs.c Kvldbint.xdr.c vldbint.h \ - ${TOP_LIBDIR}/libvldb.a depinstall + liboafs_vldb.la ${TOP_LIBDIR}/libvldb.a depinstall generated: \ vl_errors.c vlserver.h \ @@ -85,17 +91,18 @@ sascnvldb: sascnvldb.o ${LIBS} sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o -vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS) +vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.lo $(LIBS) $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ - vldbint.xdr.o \ + .lwp/vldbint.xdr.o \ $(LIBS) $(LIB_roken) ${XLIBS} vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o vlutils.o: vlutils.c ${INCLS} vlprocs.o: vlprocs.c ${INCLS} vldbint.ss.o: vldbint.ss.c vldbint.xdr.c -vldbint.cs.o: vldbint.cs.c vldbint.xdr.c -vldbint.xdr.o: vldbint.xdr.c vldbint.h + +vldbint.cs.lo: vldbint.cs.c vldbint.xdr.c +vldbint.xdr.lo: vldbint.xdr.c vldbint.h vldbint.cs.c: vldbint.xg ${RXGEN} -A -u -x -C -o $@ ${srcdir}/vldbint.xg @@ -119,10 +126,11 @@ Kvldbint.cs.c: vldbint.xg Kvldbint.xdr.c: vldbint.xg ${RXGEN} -A -x -k -c -o $@ ${srcdir}/vldbint.xg -libvldb.a: $(OBJS) AFS_component_version_number.o - $(RM) -f $@ - $(AR) crv $@ $(OBJS) AFS_component_version_number.o - $(RANLIB) $@ +libvldb.a: $(LT_objs) + $(LT_LDLIB_lwp) $(LT_objs) + +liboafs_vldb.la: liboafs_vldb.la.sym $(LT_objs) $(LT_deps) + $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) vlclient: vlclient.o libvldb.a $(LIBS) $(AFS_LDRULE) vlclient.o libvldb.a \ @@ -178,6 +186,7 @@ dest: vlserver cnvldb vldb_check libvldb.a vl_opcodes.h vlserver.h \ include ../config/Makefile.version clean: + $(LT_CLEAN) $(RM) -f *.o *.a *.otl *.xdr.c *.cs.c *.ss.c core \ vlserver vlclient cnvldb vldbint.h vlserver.h vldb_check \ vl_errors.c AFS_component_version_number.c diff --git a/src/vlserver/liboafs_vldb.la.sym b/src/vlserver/liboafs_vldb.la.sym new file mode 100644 index 000000000..173006126 --- /dev/null +++ b/src/vlserver/liboafs_vldb.la.sym @@ -0,0 +1,30 @@ +VL_GetEntryByNameO +initialize_VL_error_table +ubik_VL_ChangeAddr +ubik_VL_CreateEntry +ubik_VL_CreateEntryN +ubik_VL_DeleteEntry +ubik_VL_GetAddrs +ubik_VL_GetAddrsU +ubik_VL_GetEntryByID +ubik_VL_GetEntryByIDN +ubik_VL_GetEntryByNameN +ubik_VL_GetEntryByNameO +ubik_VL_GetEntryByNameU +ubik_VL_GetNewVolumeId +ubik_VL_GetStats +ubik_VL_LinkedList +ubik_VL_LinkedListN +ubik_VL_ListAttributes +ubik_VL_ListAttributesN +ubik_VL_ListAttributesN2 +ubik_VL_ListEntry +ubik_VL_RegisterAddrs +ubik_VL_ReleaseLock +ubik_VL_ReplaceEntry +ubik_VL_ReplaceEntryN +ubik_VL_SetLock +ubik_VL_UpdateEntry +ubik_VL_UpdateEntryByName +xdr_bulkaddrs +xdr_bulkentries -- 2.39.5