volser: Use libtool

Change-Id: Ic70476aa7258d12aafa7b06ae380012f040c65b6
Reviewed-on: http://gerrit.openafs.org/8094
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index ff667d7..6bd6182 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/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.pthread
 
 
@@ -25,11 +26,10 @@ BUCOORDOBJS=ubik_db_if.o ../bucoord/volstub.o ../bucoord/dlq.o \
            status.o ../bucoord/bucoord_errs.o
 
 VOLSEROBJS=vsprocs.o vsutils.o lockprocs.o
-VOLSERLIBS=${TOP_LIBDIR}/libvosadmin.a ${TOP_LIBDIR}/libafsadminutil.a
 
 BUTCOBJS   =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \
            tcudbprocs.o dump.o tcstatus.o butc_xbsa.o afsxbsa.o \
-            ${BUCOORDOBJS} ${VOLSEROBJS}
+            ${BUCOORDOBJS}
 
 BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
            ${TOP_INCDIR}/afs/volume.h \
@@ -48,7 +48,6 @@ BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
 BUTCINCLUDE=-I. -I${TOP_INCDIR}
 BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
            ${TOP_LIBDIR}/libbubasics.a \
-           ${VOLSERLIBS} \
             ${BUTMLIBS} \
            ${TOP_LIBDIR}/libafsauthent.a \
            $(top_builddir)/src/rxkad/liboafs_rxkad.la \

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 1710fdf..ac21268 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -23,8 +23,6 @@ VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstu
 
 VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o
 
-VOSOBJS= vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o volint.cs.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
@@ -33,8 +31,7 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
 
 objects= ${VOLSEROBJS} ${DIROBJS} ${VOLOBJS}
 
-vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
-       ${VOLOBJS}
+vosobjects= ${VLSERVEROBJS} ${DIROBJS} ${VOLOBJS}
 
 LIBS_common = \
        $(top_builddir)/src/sys/liboafs_sys.la \
@@ -50,6 +47,7 @@ LIBS_common = \
 
 LIBS_client = \
        $(top_builddir)/src/ubik/liboafs_ubik.la \
+       $(top_builddir)/src/volser/liboafs_volser.la \
        $(LIBS_common)
 
 LIBS_server = \
@@ -89,19 +87,12 @@ volint.ss.o: ../volser/volint.ss.c
 volint.xdr.o: ../volser/volint.xdr.c
        $(AFS_CCRULE) ../volser/volint.xdr.c
 
-vsprocs.o: ${VOLSER}/vsprocs.c
-       $(AFS_CCRULE) -I../volser $(VOLSER)/vsprocs.c
-
-vsutils.o: ${VOLSER}/vsutils.c
-       $(AFS_CCRULE) -I../volser $(VOLSER)/vsutils.c
-
 lockprocs.o: ${VOLSER}/lockprocs.c
        $(AFS_CCRULE) -I../volser $(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
 

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 112e68a..93120e9 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -7,11 +7,11 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.lwp
 
 HELPER_SPLINT=@HELPER_SPLINT@
 
-
 VINCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \
        ${TOP_INCDIR}/afs/vlserver.h vol.h dump.h volser.h  lockdata.h \
        voltrans_inline.h
@@ -23,6 +23,7 @@ RINCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
 INTINCLS=volint.h volser.h volser_prototypes.h volser_internal.h
 
 LIBS=\
+        $(TOP_LIBDIR)/libopr.a \
        ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/vlib.a \
        ${TOP_LIBDIR}/libacl.a \
@@ -47,6 +48,7 @@ VOLDUMP_LIBS = \
        ../vol/ihandle.o \
        ../vol/physio.o \
        ../vol/vlib.a \
+       ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libdir.a \
@@ -57,11 +59,19 @@ VOLDUMP_LIBS = \
        ${TOP_LIBDIR}/util.a \
        $(TOP_LIBDIR)/libopr.a
 
-VSOBJS=vsutils.o vsprocs.o lockprocs.o volint.xdr.o volerr.o 
-SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
- volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vol_split.o
+SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o \
+      dumpstuff.o volint.ss.o vol_split.o
+
+LT_objs = vsprocs.lo vsutils.lo lockprocs.lo volint.xdr.lo volerr.lo \
+         volint.cs.lo AFS_component_version_number.lo
+LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \
+         $(top_builddir)/src/comerr/liboafs_comerr.la \
+         $(top_builddir)/src/rx/liboafs_rx.la \
+         $(top_builddir)/src/ubik/liboafs_ubik.la \
+         $(top_builddir)/src/vlserver/liboafs_vldb.la
 
 all: volserver vos restorevol voldump \
+       liboafs_volser.la \
        ${TOP_INCDIR}/afs/volser.h \
        ${TOP_INCDIR}/afs/vsutils_prototypes.h \
        ${TOP_INCDIR}/afs/volser_prototypes.h \
@@ -89,22 +99,25 @@ restorevol: restorevol.o
        $(AFS_LDRULE) restorevol.o ${TOP_LIBDIR}/libcmd.a \
                ${TOP_LIBDIR}/util.a $(LIB_roken) ${XLIBS}
 
-vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
-       $(AFS_LDRULE) vos.o $(VSOBJS) libvolser.a \
+vos: vos.o libvolser.a ${LIBS}
+       $(AFS_LDRULE) vos.o libvolser.a \
                ${LIBS} $(LIB_roken) ${XLIBS}
 
-volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a
-       $(AFS_LDRULE) $(SOBJS) ${TOP_LIBDIR}/libdir.a \
+volserver: $(SOBJS) volerr.lo volint.xdr.lo volint.cs.lo \
+          $(LIBS) ${TOP_LIBDIR}/libdir.a
+       $(AFS_LDRULE) $(SOBJS) .lwp/volerr.o .lwp/volint.xdr.o .lwp/volint.cs.o \
+               ${TOP_LIBDIR}/libdir.a \
                $(LIBS) $(LIB_roken) ${XLIBS}
 
 voldump: vol-dump.o ${VOLDUMP_LIBS}
        $(AFS_LDRULE) vol-dump.o ${VOLDUMP_LIBS} \
                $(LIB_roken) ${XLIBS}
 
-libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
-       -$(RM) -f $@
-       $(AR) crv $@ volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o 
-       $(RANLIB) $@
+libvolser.a: $(LT_objs)
+       $(LT_LDLIB_lwp) $(LT_objs)
+
+liboafs_volser.la: liboafs_volser.la.sym $(LT_objs) $(LT_deps)
+       $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
 
 volser.h: volerr.c
 
@@ -131,16 +144,16 @@ volint.xdr.c: volint.h
 #
 # Dependencies
 #
-volint.cs.o: volint.cs.c ${INTINCLS}
+volint.cs.lo: volint.cs.c ${INTINCLS}
 volint.ss.o: volint.ss.c ${INTINCLS}
-volint.xdr.o: volint.xdr.c ${INTINCLS}
-vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
+volint.xdr.lo: volint.xdr.c ${INTINCLS}
+vsutils.lo: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
 volmain.o: volmain.c ${VINCLS} ${RINCLS} ${INTINCLS} AFS_component_version_number.c
 volprocs.o: volprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
 dumpstuff.o: dumpstuff.c ${VINCLS} ${RINCLS} ${INTINCLS}
 voldump.o: voldump.c ${VINCLS} ${RINCLS}
 vos.o: vos.c ${VINCLS} ${RINCLS} ${INTINCLS} AFS_component_version_number.c
-vsprocs.o: vsprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
+vsprocs.lo: vsprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
 physio.o: physio.c ${VINCLS}
 common.o: common.c ${VINCLS}
 lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS}
@@ -217,6 +230,7 @@ dest: restorevol voldump volser.h volint.h vos volserver libvolser.a
 # Misc targets
 # 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *.a core volserver volint.ss.c volint.cs.c volint.h \
        volint.xdr.c vos volser.h volerr.c AFS_component_version_number.c restorevol voldump
 

diff --git a/src/volser/liboafs_volser.la.sym b/src/volser/liboafs_volser.la.sym
new file mode 100644 (file)
index 0000000..7f7875c
--- /dev/null
+++ b/src/volser/liboafs_volser.la.sym
@@ -0,0 +1,60 @@
+AFSVolConvertROtoRWvolume
+AFSVolEndTrans
+AFSVolListOneVolume
+AFSVolTransCreate
+EnumerateEntry
+Lp_GetRwIndex
+Lp_ROMatch
+MapHostToNetwork
+MapNetworkToHost
+MapPartIdIntoName
+PrintError
+StartAFSVolDump
+SubEnumerateEntry
+UV_AddSite2
+UV_BackupVolume
+UV_Bind
+UV_ChangeLocation
+UV_CloneVolume
+UV_CopyVolume2
+UV_CreateVolume3
+UV_DeleteVolume
+UV_DumpClonedVolume
+UV_DumpVolume
+UV_GetSize
+UV_ListOneVolume
+UV_ListPartitions
+UV_ListVolumes
+UV_LockRelease
+UV_MoveVolume2
+UV_NukeVolume
+UV_PartitionInfo64
+UV_ReleaseVolume
+UV_RemoveSite
+UV_RenameVolume
+UV_RestoreVolume
+UV_RestoreVolume2
+UV_SetSecurity
+UV_SetVolume
+UV_SetVolumeInfo
+UV_SyncServer
+UV_SyncVldb
+UV_SyncVolume
+UV_VolserStatus
+UV_VolumeZap
+UV_XListOneVolume
+UV_XListVolumes
+VLDB_GetEntryByID
+VLDB_GetEntryByName
+VLDB_IsSameAddrs
+VLDB_ListAttributes
+VLDB_ListAttributesN2
+VLDB_ReplaceEntry
+cstruct
+init_volintInfo
+initialize_VOLS_error_table
+noresolve
+verbose
+vsu_ClientInit
+vsu_ExtractName
+vsu_GetVolumeID