From 2b1481dae535c399cce837f3d63b1c76831b8190 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 9 Jan 2013 09:52:53 +0000 Subject: [PATCH] Build system: MT_LIBS includes XLIBS The MT_LIBS library list already includes XLIBS, so there's no need to specify both on a link line. Change-Id: I8594b1b6e1a16af741b40822cbce49e846b26f49 Reviewed-on: http://gerrit.openafs.org/8904 Reviewed-by: Daria Brashear Reviewed-by: Benjamin Kaduk Tested-by: BuildBot --- src/afsd/Makefile.in | 6 ++--- src/dviced/Makefile.in | 5 ++-- src/libadmin/samples/Makefile.in | 42 ++++++++++++++++---------------- src/libadmin/test/Makefile.in | 2 +- src/rx/test/Makefile.in | 2 +- src/rxkad/test/Makefile.in | 4 +-- src/rxosd/Makefile.in | 5 ++-- src/tbudb/Makefile.in | 2 +- src/tbutc/Makefile.in | 2 +- src/tools/rxperf/Makefile.in | 2 +- src/tptserver/Makefile.in | 17 ++++++------- src/tsalvaged/Makefile.in | 6 ++--- src/tvlserver/Makefile.in | 10 ++++---- src/tvolser/Makefile.in | 4 +-- src/venus/Makefile.in | 2 +- src/viced/Makefile.in | 4 +-- tests/rpctestlib/Makefile.in | 2 +- 17 files changed, 57 insertions(+), 60 deletions(-) diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index c1dd92b8b..4e7319c74 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -37,17 +37,17 @@ FUSE_LIBS=@FUSE_LIBS@ LDFLAGS_afsd = $(AFSD_LDFLAGS) afsd: afsd.o afsd_kernel.o $(AFSLIBS) $(AFSD_LIBS) $(LT_LDRULE_static) afsd.o afsd_kernel.o $(NON_SHARED) \ - $(AFSLIBS) ${AFSD_LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) $(XLIBS) + $(AFSLIBS) ${AFSD_LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) LDFLAGS_afsd.fuse = $(AFSD_LDFLAGS) afsd.fuse: afsd_fuse.o $(UAFSLIBS) $(AFSD_LIBS) $(LT_LDRULE_static) afsd_fuse.o $(NON_SHARED) \ $(UAFSLIBS) $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) $(LIB_crypt) \ - ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS} + ${FUSE_LIBS} ${AFSD_LIBS} vsys: vsys.o ${AFS_LDRULE} vsys.o ${TOP_LIBDIR}/libsys.a \ - $(LIB_roken) $(MT_LIBS) ${XLIBS} + $(LIB_roken) $(MT_LIBS) # # Objects diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in index 80955af74..086dbe5f0 100644 --- a/src/dviced/Makefile.in +++ b/src/dviced/Makefile.in @@ -139,11 +139,10 @@ state_analyzer.o: ${VICED}/state_analyzer.c dafileserver: ${objects} ${LIBS} $(LT_LDRULE_static) ${objects} \ - ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} state_analyzer: ${SDBGOBJS} - $(LT_LDRULE_static) ${SDBGOBJS} \ - $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LT_LDRULE_static) ${SDBGOBJS} $(LIB_roken) ${MT_LIBS} install: dafileserver state_analyzer ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index b37b97bd9..0893f8969 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -49,87 +49,87 @@ all test tests: $(SAMPLEPROGS) cm_client_config: cm_client_config.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) cm_list_cells: cm_list_cells.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) cm_local_cell: cm_local_cell.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) cm_server_prefs: cm_server_prefs.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxdebug_basic_stats: rxdebug_basic_stats.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxdebug_conns: rxdebug_conns.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxdebug_peers: rxdebug_peers.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxdebug_rx_stats: rxdebug_rx_stats.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxdebug_supported_stats: rxdebug_supported_stats.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxdebug_version: rxdebug_version.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_clear_peer: rxstat_clear_peer.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_clear_process: rxstat_clear_process.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_disable_peer: rxstat_disable_peer.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_disable_process: rxstat_disable_process.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_enable_peer: rxstat_enable_peer.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_enable_process: rxstat_enable_process.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_get_peer: rxstat_get_peer.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_get_process: rxstat_get_process.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_get_version: rxstat_get_version.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_query_peer: rxstat_query_peer.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS) $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) # # Errors diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index aff153dbf..7e31ab660 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -41,7 +41,7 @@ CFLAGS_client.o = @CFLAGS_NOERROR@ afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS) $(LT_LDRULE_static) afscp.o $(AFSCPOBJS) $(AFSCPLIBS) \ - $(LIB_roken) $(LIB_crypt) ${MT_LIBS} $(XLIBS) + $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ####################################################################### install: diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in index 826608d7b..d84e9690d 100644 --- a/src/rx/test/Makefile.in +++ b/src/rx/test/Makefile.in @@ -24,7 +24,7 @@ LINK = $(AFS_LDRULE) $@.o ${LIBS} MT_LINK = $(CC) $(MT_CFLAGS) $(COMMON_CFLAGS) $(AFS_LDFLAGS) -o $@ \ $@.o $(TOP_LIBDIR)/libafsrpc.a $(TOP_LIBDIR)/libopr.a \ $(LIB_hcrypto) $(LIB_roken) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) TESTS = testclient testserver kstest kctest testqueue tableGen generator diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index c37360c23..c4f6c434f 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -29,7 +29,7 @@ LIBS=${TOP_LIBDIR}/libauth.a \ THLIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \ - ${MT_LIBS} ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread + ${MT_LIBS} ${ULIBS} ${LIBRPC} -lpthread THRULE = ${MT_CC} $(COMMON_CFLAGS) $(MT_CFLAGS) @@ -104,5 +104,5 @@ th_stress: th_stress.o th_stress.xdr.o th_stress_c.o th_stress_s.o \ ${LIBRPC} $(LT_LDRULE_static) th_stress.o th_stress.xdr.o th_stress_c.o \ th_stress_s.o th_stress.cs.o th_stress.ss.o stress_errs.o \ - ${THLIBS} ${XLIBS} + ${THLIBS} diff --git a/src/rxosd/Makefile.in b/src/rxosd/Makefile.in index 5017076b2..83249b329 100644 --- a/src/rxosd/Makefile.in +++ b/src/rxosd/Makefile.in @@ -51,7 +51,7 @@ ${TOP_INCDIR}/afs/rxosd.h: rxosd.h osd: osd.o rxosd.cs.o osddbuser.o policy_parser.o ${AFS_LDRULE} osd.o rxosd.cs.o rxosd.xdr.o policy_parser.o \ - ${OSDDBOBJS} ${LIBS} ${MT_LIBS} ${XLIBS} + ${OSDDBOBJS} ${LIBS} ${MT_LIBS} CFLAGS_rxosd.o = ${HSM_INC} ${PNFS_OPT} -DBUILDING_RXOSD @@ -155,8 +155,7 @@ rxosd.h: rxosd.xg ${RXGEN} -x -h -o $@ ${srcdir}/rxosd.xg rxosd: rxosd.h ${objects} ${LIBS} - ${AFS_LDRULE} -ldl ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} \ - ${HSM_LIB} + ${AFS_LDRULE} -ldl ${objects} ${LIBS} ${MT_LIBS} ${HSM_LIB} CFLAGS_readabyte.o = ${HSM_INC} ${PNFS_OPT} -DBUILDING_RXOSD diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index df2e5b932..e5634d799 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -105,7 +105,7 @@ server.o: ${BUDB}/server.c budb_errs.h ${INCLS} budb_server: $(SERVER_OBJS) ${LIBS} $(LT_LDRULE_static) $(SERVER_OBJS) ${LIBS} \ - $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} budb.cs.c: ${BUDB}/budb.rg ${RXGEN} -u -C -o $@ ${BUDB}/budb.rg diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index a96b05c42..b6f3ddfe6 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -69,7 +69,7 @@ all: butc butc: ${BUTCOBJS} ${BUTCLIBS} $(LT_LDRULE_static) ${BUTCOBJS} ${BUTCLIBS} \ - $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} libbutm.a: ${BUTMOBJS} AFS_component_version_number.o -$(RM) -f libbutm.a diff --git a/src/tools/rxperf/Makefile.in b/src/tools/rxperf/Makefile.in index e7be44018..91122aa5a 100644 --- a/src/tools/rxperf/Makefile.in +++ b/src/tools/rxperf/Makefile.in @@ -9,7 +9,7 @@ all: rxperf rxperf: rxperf.o $(LIBS) $(LT_LDRULE_static) rxperf.o $(LIBS) $(LIB_hcrypto) $(LIB_roken) \ - $(MT_LIBS) $(XLIBS) + $(MT_LIBS) install: diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index fd6a96ad6..cbde711e2 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -91,54 +91,53 @@ ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o \ $(LT_LDRULE_static) ptserver.o ptutils.o ptprocs.o \ ptint.ss.o ptint.xdr.o utils.o map.o \ $(LIBS_server) \ - $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \ - ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} db_verify.o: ${PTSERVER}/db_verify.c ${INCLS} $(AFS_CCRULE) $(PTSERVER)/db_verify.c db_verify: db_verify.o $(LIBS_client) $(LT_LDRULE_static) db_verify.o \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ptclient: ptclient.o AFS_component_version_number.o $(LIBS_client) $(LT_LDRULE_static) ptclient.o \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ptclient.o: ${PTSERVER}/ptclient.c ${INCLS} $(AFS_CCRULE) $(PTSERVER)/ptclient.c pts: pts.o $(LIBS_client) ${INCLS} $(LT_LDRULE_static) pts.o \ - ${LIBS_client} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + ${LIBS_client} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} pts.o: ${PTSERVER}/pts.c $(AFS_CCRULE) $(PTSERVER)/pts.c readgroup: readgroup.o $(LIBS_client) $(LT_LDRULE_static) readgroup.o \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} readgroup.o: ${PTSERVER}/readgroup.c ${INCLS} $(AFS_CCRULE) $(PTSERVER)/readgroup.c readpwd: readpwd.o $(LIBS_client) $(LT_LDRULE_static) readpwd.o \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} readpwd.o: ${PTSERVER}/readpwd.c ${INCLS} $(AFS_CCRULE) $(PTSERVER)/readpwd.c testpt: testpt.o $(LIBS_client) $(LT_LDRULE_static) testpt.o -lm \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} testpt.o: ${PTSERVER}/testpt.c ${INCLS} $(AFS_CCRULE) $(PTSERVER)/testpt.c pt_util: pt_util.o ptutils.o ptubik.o utils.o map.o $(LIBS_client) $(LT_LDRULE_static) pt_util.o ptutils.o ptubik.o utils.o map.o \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} pt_util.o: ${PTSERVER}/pt_util.c $(AFS_CCRULE) $(PTSERVER)/pt_util.c diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index 5e8265d9f..c0c337c77 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -164,7 +164,7 @@ namei_ops.o: ${VOL}/namei_ops.c salvageserver: ${OBJECTS} ${LIBS} $(LT_LDRULE_static) ${OBJECTS} ${LIBS} \ - $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} dasalvager: ${SOBJECTS} ${LIBS} $(LT_LDRULE_static) ${SOBJECTS} ${LIBS} \ @@ -172,11 +172,11 @@ dasalvager: ${SOBJECTS} ${LIBS} dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS} $(LT_LDRULE_static) ${FSSDEBUG_OBJS} ${LIBS} \ - $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS} $(LT_LDRULE_static) ${SSSDEBUG_OBJS} ${LIBS} \ - $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} install: salvageserver dafssync-debug salvsync-debug dasalvager ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index bf5737c45..d35fc676b 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -54,21 +54,21 @@ depinstall: 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} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} vldb_check.o: ${VLSERVER}/vldb_check.c $(AFS_CCRULE) $(VLSERVER)/vldb_check.c cnvldb: cnvldb.o $(LIBS_client) $(LT_LDRULE_static) cnvldb.o \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} cnvldb.o: ${VLSERVER}/cnvldb.c $(AFS_CCRULE) $(VLSERVER)/cnvldb.c sascnvldb: sascnvldb.o $(LIBS_client) $(LT_LDRULE_static) sascnvldb.o \ - $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} sascnvldb.o: ${VLSERVER}/sascnvldb.c $(AFS_CCRULE) $(VLSERVER)/sascnvldb.c @@ -76,7 +76,7 @@ sascnvldb.o: ${VLSERVER}/sascnvldb.c 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_server) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIBS_server) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o $(AFS_CCRULE) $(VLSERVER)/vlserver.c @@ -105,7 +105,7 @@ vldbint.xdr.c: vldbint.h vlclient: vlclient.o $(LIBS_client) $(LT_LDRULE_static) vlclient.o $(LIBS_client) \ - $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIB_roken) ${MT_LIBS} vlclient.o: ${VLSERVER}/vlclient.c $(AFS_CCRULE) $(VLSERVER)/vlclient.c diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index f11e696a2..0a7e0c548 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -178,11 +178,11 @@ vos.o: ${VOLSER}/vos.c vos: vos.o ${VOSOBJS} ${VLSERVEROBJS} $(LIBS_client) $(LT_LDRULE_static) vos.o ${VOSOBJS} ${VLSERVEROBJS} $(LIBS_client) \ - $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} volserver: ${objects} $(LIBS_server) $(LT_LDRULE_static) ${objects} $(LIBS_server) \ - $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} install: volserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index b5bad6b54..78645b7d6 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -93,7 +93,7 @@ afscbint.ss.o: ../fsint/afscbint.ss.c 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} \ + $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \ $(LDFLAGS_krb5) $(LIB_krb5) livesys.o: livesys.c ${INCLS} AFS_component_version_number.c diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 74964cdf2..46575d74a 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -54,7 +54,7 @@ fsprobe.o: fsprobe.c AFS_component_version_number.c fsprobe: fsprobe.o $(LT_LDRULE_static) fsprobe.o \ - ${LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) ${XLIBS} + ${LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) CFLAGS_cbd.o = -DINTERPRET_DUMP cbd.o: callback.c AFS_component_version_number.c @@ -128,7 +128,7 @@ afsint.ss.o: ../fsint/afsint.ss.c fileserver: ${objects} ${LIBS} $(LT_LDRULE_static) ${objects} \ - ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} + ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} install: fileserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/tests/rpctestlib/Makefile.in b/tests/rpctestlib/Makefile.in index 489325fdd..90b37d31c 100644 --- a/tests/rpctestlib/Makefile.in +++ b/tests/rpctestlib/Makefile.in @@ -63,7 +63,7 @@ afscbint.xdr.o: ${FSINT}/afscbint.xdr.c xmpl_driver: librpc_test_lib.a rpc_test_main.o ${LIBS} $(LT_LDRULE_static) rpc_test_main.o librpc_test_lib.a \ - ${LIBS} ${LIB_hcrypto} ${MT_LIBS} ${XLIBS} + ${LIBS} ${LIB_hcrypto} ${MT_LIBS} librpc_test_lib.a: ${LIBOBJS} $(RM) -f $@ -- 2.39.5