Tidy up library includes

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

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 4cb1d03..3ab86a3 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -9,13 +9,10 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
+ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
-MODULE_CFLAGS=-DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_CLIENT
+MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT
 
 VLSERVER=$(srcdir)/../vlserver
 LWP=$(srcdir)/../lwp
@@ -36,7 +33,7 @@ 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
+UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
 
 DIROBJS=buffer.o dir.o salvage.o
 
@@ -52,15 +49,22 @@ objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
 vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \
        ${VOLOBJS} ${RXOBJS}
 
-LIBS=  ${TOP_LIBDIR}/libcmd.a          \
+LIBS_common = \
+       ${TOP_LIBDIR}/libcmd.a          \
        ${TOP_LIBDIR}/libafsauthent.a   \
-       ${TOP_LIBDIR}/libafsrpc.a       \
        ${TOP_LIBDIR}/libafsutil.a      \
-       ${TOP_LIBDIR}/libusd.a
+       ${TOP_LIBDIR}/libusd.a          \
+       ${TOP_LIBDIR}/libafsrpc.a       \
+       $(top_builddir)/src/opr/liboafs_opr.la
 
-all: volserver 
+LIBS_client = \
+       $(TOP_LIBDIR)/libubik_pthread.a \
+       $(LIBS_common)
 
-all_vos: vos
+LIBS_server = \
+       $(LIBS_common)
+
+all: volserver vos
 
 CFLAGS_rx_pthread.o = -DDPF_FSLOG
 rx_pthread.o: ${RX}/rx_pthread.c
@@ -97,16 +101,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
+       $(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c
 
 uuid.o: ${UTIL}/uuid.c
        $(AFS_CCRULE) $(UTIL)/uuid.c
@@ -123,15 +124,15 @@ volparse.o: ${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
 
+pthread_threadname.o: ${UTIL}/pthread_threadname.c
+       $(AFS_CCRULE) $(UTIL)/pthread_threadname.c
+
 lock.o: ${LWP}/lock.c
        $(AFS_CCRULE) $(LWP)/lock.c
 
@@ -212,34 +213,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