usd: Convert to using libtool

[openafs.git] / src / tvolser / Makefile.in

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 0788f6a..e022ef9 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -10,13 +10,13 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 HELPER_SPLINT=@HELPER_SPLINT@
+ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
 MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT
 
 VLSERVER=$(srcdir)/../vlserver
 LWP=$(srcdir)/../lwp
 LIBACL=$(srcdir)/../libacl
-UTIL=$(srcdir)/../util
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 VOLSER=$(srcdir)/../volser
@@ -32,8 +32,6 @@ LWPOBJS=lock.o threadname.o
 
 LIBACLOBJS=aclprocs.o netprocs.o
 
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
@@ -43,20 +41,27 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
 RXOBJS=rx_pthread.o
 
 objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${RXOBJS}
+        ${DIROBJS} ${VOLOBJS} ${RXOBJS}
 
-vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \
+vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
        ${VOLOBJS} ${RXOBJS}
 
-LIBS=  ${TOP_LIBDIR}/libcmd.a          \
+LIBS_common = \
+       $(top_builddir)/src/cmd/liboafs_cmd.la \
        ${TOP_LIBDIR}/libafsauthent.a   \
-       ${TOP_LIBDIR}/libafsutil.a      \
-       ${TOP_LIBDIR}/libusd.a          \
-       ${TOP_LIBDIR}/libafsrpc.a
+       $(top_builddir)/src/util/liboafs_util.la      \
+       $(top_builddir)/src/usd/liboafs_usd.la          \
+       ${TOP_LIBDIR}/libafsrpc.a       \
+       $(top_builddir)/src/opr/liboafs_opr.la
+
+LIBS_client = \
+       $(TOP_LIBDIR)/libubik_pthread.a \
+       $(LIBS_common)
 
-all: volserver 
+LIBS_server = \
+       $(LIBS_common)
 
-all_vos: vos
+all: volserver vos
 
 CFLAGS_rx_pthread.o = -DDPF_FSLOG
 rx_pthread.o: ${RX}/rx_pthread.c
@@ -93,40 +98,13 @@ volint.xdr.o: ../volser/volint.xdr.c
        $(AFS_CCRULE) ../volser/volint.xdr.c
 
 vsprocs.o: ${VOLSER}/vsprocs.c
-       $(AFS_CCRULE) $(VOLSER)/vsprocs.c
+       $(AFS_CCRULE) -I../volser $(VOLSER)/vsprocs.c
 
 vsutils.o: ${VOLSER}/vsutils.c
-       $(AFS_CCRULE) $(VOLSER)/vsutils.c
+       $(AFS_CCRULE) -I../volser $(VOLSER)/vsutils.c
 
 lockprocs.o: ${VOLSER}/lockprocs.c
-       $(AFS_CCRULE) $(VOLSER)/lockprocs.c
-
-assert.o: ${UTIL}/assert.c
-       $(AFS_CCRULE) $(UTIL)/assert.c
-
-uuid.o: ${UTIL}/uuid.c
-       $(AFS_CCRULE) $(UTIL)/uuid.c
-
-serverLog.o: ${UTIL}/serverLog.c
-       $(AFS_CCRULE) $(UTIL)/serverLog.c
-
-fileutil.o: ${UTIL}/fileutil.c
-       $(AFS_CCRULE) $(UTIL)/fileutil.c
-
-volparse.o: ${UTIL}/volparse.c
-       $(AFS_CCRULE) $(UTIL)/volparse.c
-
-flipbase64.o: ${UTIL}/flipbase64.c
-       $(AFS_CCRULE) $(UTIL)/flipbase64.c
-
-netutils.o: ${UTIL}/netutils.c
-       $(AFS_CCRULE) -I../util $(UTIL)/netutils.c
-
-dirpath.o: ${UTIL}/dirpath.c
-       $(AFS_CCRULE) $(UTIL)/dirpath.c
-
-softsig.o: ${UTIL}/softsig.c
-       $(AFS_CCRULE) $(UTIL)/softsig.c
+       $(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c
 
 lock.o: ${LWP}/lock.c
        $(AFS_CCRULE) $(LWP)/lock.c
@@ -208,34 +186,34 @@ namei_ops.o: ${VOL}/namei_ops.c
        $(AFS_CCRULE) $(VOL)/namei_ops.c
 
 vos.o: ${VOLSER}/vos.c
-       $(AFS_CCRULE) $(VOLSER)/vos.c
+       $(AFS_CCRULE) -I../volser $(VOLSER)/vos.c
 
-vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
-       $(AFS_LDRULE) vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} \
-               ${TOP_LIBDIR}/libubik_pthread.a \
+vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} $(LIBS_client)
+       $(LT_LDRULE_static) vos.o ${VOSOBJS} ${VLSERVEROBJS} $(LIBS_client) \
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
-volserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+volserver: ${objects} $(LIBS_server)
+       $(LT_LDRULE_static) ${objects} $(LIBS_server) \
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 install: volserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-       ${INSTALL} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
-
-install_vos: vos
-       ${INSTALL} vos ${DESTDIR}${afssrvsbindir}/vos
-       ${INSTALL} vos ${DESTDIR}${sbindir}/vos
+       ${LT_INSTALL_PROGRAM} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then     \
+           $(LT_INSTALL_PROGRAM) vos ${DESTDIR}${afssrvsbindir}/vos;     \
+           $(LT_INSTALL_PROGRAM) vos ${DESTDIR}${sbindir}/vos;           \
+       fi
 
 dest: volserver
        ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
        ${INSTALL} volserver ${DEST}/root.server/usr/afs/bin/volserver
-
-dest_vos: vos
-       ${INSTALL} vos ${DEST}/root.server/usr/afs/bin/vos
-       ${INSTALL} vos ${DEST}/etc/vos
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then      \
+           ${INSTALL} vos ${DEST}/root.server/usr/afs/bin/vos; \
+           ${INSTALL} vos ${DEST}/etc/vos;                     \
+       fi
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o volserver core AFS_component_version_number.c
 
 include ../config/Makefile.version