From d01ef1ccfb75bdb649abf5586b786bae0f3eeb1a Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 17 Aug 2012 14:52:16 +0100
Subject: [PATCH] Tidy up library includes

Tidy up the way that library inclusion is performed in the tptserver,
tvlserver and tvolserver Makefiles by splitting the library list into
common, client and server, using the appropriate list for each binary,
and removing duplicate library or object includes.

Change-Id: I5bde3f8b4105372c22984ccd486b145b434ae82e
Reviewed-on: http://gerrit.openafs.org/8042
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---
 src/tptserver/Makefile.in | 65 ++++++++++++++++++++++++++---------------------
 src/tvlserver/Makefile.in | 30 +++++++++++++---------
 src/tvolser/Makefile.in   | 21 ++++++++++-----
 3 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 7d02442..de29a4a 100644
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -22,6 +22,8 @@ UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
      volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
      pthread_threadname.o
 
+PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
+
 INCLS=${TOP_INCDIR}/ubik.h \
 	${TOP_INCDIR}/lock.h  \
 	${TOP_INCDIR}/lwp.h \
@@ -32,16 +34,20 @@ INCLS=${TOP_INCDIR}/ubik.h \
 	ptint.h \
 	pterror.h
 
-LIBS=${RXOBJS} ${UTILOBJS}\
+LIBS_common=$(RXOBJS) $(UTILOBJS) \
 	${TOP_LIBDIR}/libubik_pthread.a \
 	${TOP_LIBDIR}/libafsauthent.a \
 	${TOP_LIBDIR}/libafsrpc.a \
 	${TOP_LIBDIR}/libcmd.a \
-	$(top_builddir)/src/opr/liboafs_opr.la \
+	${TOP_LIBDIR}/libafsutil.a \
+	$(top_builddir)/src/opr/liboafs_opr.la
+
+LIBS_server= \
 	${TOP_LIBDIR}/libaudit.a \
-	${TOP_LIBDIR}/libafsutil.a 
+	$(LIBS_common)
 
-PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
+LIBS_client=$(PTOBJS) \
+	$(LIBS_common)
 
 all: ptserver pts pt_util db_verify \
 	depinstall readgroup readpwd testpt
@@ -67,7 +73,7 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c
 # get the pthreaded util stuff compiled here.  we do this instead of
 # using the non-pthreaded libutil.a.  There probably should be a
 # pthreaded version of this library, as we are doing with ubik itself, but...
-#
+
 
 assert.o: ${UTIL}/assert.c
 	$(AFS_CCRULE) $(UTIL)/assert.c
@@ -149,23 +155,25 @@ Kptint.h: ${PTSERVER}/ptint.xg
 display.o: ${PTSERVER}/display.c ${INCLS}
 	${AFS_CCRULE} ${PTSERVER}/display.c
 
-ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) map.o
+ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o \
+	  $(LIBS_server)
 	$(LT_LDRULE_static) ptserver.o ptutils.o ptprocs.o \
 		ptint.ss.o ptint.xdr.o utils.o map.o \
-		$(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \
+		$(LIBS_server) \
+		$(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \
 		${XLIBS}
 
 db_verify.o: ${PTSERVER}/db_verify.c ${INCLS}
 	$(AFS_CCRULE) $(PTSERVER)/db_verify.c
 
-db_verify: db_verify.o pterror.o display.o $(LIBS)
-	$(LT_LDRULE_static) db_verify.o display.o pterror.o \
-		$(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+db_verify: db_verify.o display.o $(LIBS_client)
+	$(LT_LDRULE_static) db_verify.o display.o \
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
-ptclient: ptclient.o display.o ptuser.o pterror.o ptint.cs.o ptint.xdr.o \
-	AFS_component_version_number.o $(LIBS)
+ptclient: ptclient.o display.o ptuser.o ptint.cs.o ptint.xdr.o \
+	AFS_component_version_number.o $(LIBS_client)
 	$(LT_LDRULE_static) ptclient.o display.o $(PTOBJS) \
-		$(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 ptclient.o: ${PTSERVER}/ptclient.c ${INCLS}
 	$(AFS_CCRULE) $(PTSERVER)/ptclient.c
@@ -177,38 +185,37 @@ pterror.h pterror.c: ${PTSERVER}/pterror.et
 	$(RM) -f pterror.h pterror.c
 	${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror
 
-pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${INCLS}
-	$(LT_LDRULE_static) pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) \
-		${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+pts: pts.o ${TOP_LIBDIR}/libcmd.a $(LIBS_client) ${INCLS}
+	$(LT_LDRULE_static) pts.o \
+		${LIBS_client} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 pts.o: ${PTSERVER}/pts.c
 	$(AFS_CCRULE) $(PTSERVER)/pts.c
 
-readgroup: readgroup.o $(PTOBJS) $(LIBS)
-	$(LT_LDRULE_static) readgroup.o $(PTOBJS) \
-		${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+readgroup: readgroup.o $(LIBS_client)
+	$(LT_LDRULE_static) readgroup.o \
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 readgroup.o: ${PTSERVER}/readgroup.c ${INCLS}
 	$(AFS_CCRULE) $(PTSERVER)/readgroup.c
 
-readpwd: readpwd.o $(PTOBJS) $(LIBS)
-	$(LT_LDRULE_static) readpwd.o $(PTOBJS) \
-		${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+readpwd: readpwd.o $(LIBS_client)
+	$(LT_LDRULE_static) readpwd.o \
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 readpwd.o: ${PTSERVER}/readpwd.c ${INCLS}
 	$(AFS_CCRULE) $(PTSERVER)/readpwd.c
 
-testpt: testpt.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS)
-	$(LT_LDRULE_static) testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) \
-		$(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+testpt: testpt.o $(LIBS_client)
+	$(LT_LDRULE_static) testpt.o -lm \
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 testpt.o: ${PTSERVER}/testpt.c ${INCLS}
 	$(AFS_CCRULE) $(PTSERVER)/testpt.c
 
-pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS)
-	$(LT_LDRULE_static) pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) \
-		${TOP_LIBDIR}/libcmd.a \
-		$(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(LIBS_client)
+	$(LT_LDRULE_static) pt_util.o ptutils.o ubik.o utils.o map.o \
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 pt_util.o: ${PTSERVER}/pt_util.c
 	$(AFS_CCRULE) $(PTSERVER)/pt_util.c
diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index d762e7f..163f64c 100644
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -31,16 +31,22 @@ INCLS=${TOP_INCDIR}/ubik.h \
              ${TOP_INCDIR}/afs/cellconfig.h \
 	vlserver.h vldbint.h
 
-LIBS=	${TOP_LIBDIR}/libubik_pthread.a \
+LIBS_common = \
+	${TOP_LIBDIR}/libubik_pthread.a \
 	${TOP_LIBDIR}/libafsauthent.a \
 	${TOP_LIBDIR}/libcmd.a \
 	${TOP_LIBDIR}/libafsrpc.a \
-	${TOP_LIBDIR}/libaudit.a \
 	${TOP_LIBDIR}/libafsutil.a \
 	$(top_builddir)/src/opr/liboafs_opr.la
 
-OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS} 
+LIBS_server = \
+	${TOP_LIBDIR}/libaudit.a \
+	$(LIBS_common)
+
+LIBS_client = \
+	$(LIBS_common)
 
+OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS}
 
 all: \
 	vlserver vlclient vlserver cnvldb vldb_check \
@@ -95,31 +101,31 @@ pthread_threadname.o: ${UTIL}/pthread_threadname.c
 #
 
 
-vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o
+vldb_check: vldb_check.o AFS_component_version_number.o $(LIBS_client)
 	$(LT_LDRULE_static) vldb_check.o AFS_component_version_number.o \
-		${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} 
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 vldb_check.o: ${VLSERVER}/vldb_check.c 
 	$(AFS_CCRULE) $(VLSERVER)/vldb_check.c
 
-cnvldb: cnvldb.o ${LIBS} 
+cnvldb: cnvldb.o $(LIBS_client)
 	$(LT_LDRULE_static) cnvldb.o \
-		${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 cnvldb.o: ${VLSERVER}/cnvldb.c
 	$(AFS_CCRULE) $(VLSERVER)/cnvldb.c
 
-sascnvldb: sascnvldb.o ${LIBS} 
+sascnvldb: sascnvldb.o $(LIBS_client)
 	$(LT_LDRULE_static) sascnvldb.o \
-		${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 sascnvldb.o: ${VLSERVER}/sascnvldb.c
 	$(AFS_CCRULE) $(VLSERVER)/sascnvldb.c
 
-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.o $(LIBS_server)
 	$(LT_LDRULE_static) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
 		vldbint.xdr.o \
-		$(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+		$(LIBS_server) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o
 	$(AFS_CCRULE) $(VLSERVER)/vlserver.c
@@ -158,7 +164,7 @@ Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
 
 vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS}
 	$(LT_LDRULE_static) vlclient.o $(OBJS) ${TOP_LIBDIR}/libcmd.a \
-		$(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+		$(LIBS_server) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 		
 vlclient.o: ${VLSERVER}/vlclient.c
 	$(AFS_CCRULE) $(VLSERVER)/vlclient.c
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index cd0d0be..3ab86a3 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -49,13 +49,21 @@ 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}/libafsutil.a      \
 	${TOP_LIBDIR}/libusd.a          \
 	${TOP_LIBDIR}/libafsrpc.a	\
 	$(top_builddir)/src/opr/liboafs_opr.la
 
+LIBS_client = \
+	$(TOP_LIBDIR)/libubik_pthread.a \
+	$(LIBS_common)
+
+LIBS_server = \
+	$(LIBS_common)
+
 all: volserver vos
 
 CFLAGS_rx_pthread.o = -DDPF_FSLOG
@@ -207,14 +215,13 @@ namei_ops.o: ${VOL}/namei_ops.c
 vos.o: ${VOLSER}/vos.c
 	$(AFS_CCRULE) -I../volser $(VOLSER)/vos.c
 
-vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
-	$(LT_LDRULE_static) 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}
-	$(LT_LDRULE_static) ${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}
-- 
1.9.4