Build system: MT_LIBS includes XLIBS

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

diff --git a/src/rxosd/Makefile.in b/src/rxosd/Makefile.in
index 6b9dcd1..83249b3 100644 (file)
--- a/src/rxosd/Makefile.in
+++ b/src/rxosd/Makefile.in
@@ -8,10 +8,6 @@ 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@
 
 HSM_LIB=@HSM_LIB@
 HSM_INC=@HSM_INC@
@@ -26,11 +22,9 @@ VOL=../vol
 OSDDBSRC=${srcdir}/../osddb
 FSINT=../fsint
 
-CC=${MT_CC}
-
 CLIENTOBJS=osd.o
 
-RXOSDOBJS=rxosd.o rxosd.ss.o rxosd.cs.o rxosd.xdr.o rxosd_hpss.o rxosd_dcache.o        
+RXOSDOBJS=rxosd.o rxosd.ss.o rxosd.cs.o rxosd.xdr.o rxosd_hpss.o rxosd_dcache.o
 
 LWPOBJS=lock.o threadname.o
 
@@ -57,8 +51,8 @@ ${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
 
 CFLAGS_hpss.o = ${HSM_INC} ${PNFS_OPT} -DBUILDING_RXOSD
@@ -161,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
 
@@ -178,7 +171,7 @@ librxosd.a: rxosd.xdr.o rxosd.cs.o
 ${TOP_LIBDIR}/librxosd.a: librxosd.a
        ${INSTALL} $? $@
 
-install: 
+install:
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} -d ${DESTDIR}${bindir}
        ${INSTALL_PROGRAM} rxosd ${DESTDIR}}${afssrvlibexecdir}/rxosd
@@ -191,7 +184,7 @@ dest:
        ${INSTALL_PROGRAM} rxosd ${DEST}/root.server/usr/afs/bin/rxosd
        ${INSTALL_PROGRAM} readabyte ${DEST}/root.server/usr/afs/bin/readabyte
        ${INSTALL_PROGRAM} osd ${DEST}/bin/osd
-       
+
 clean:
        $(RM) -f *.o rxosd.*.* rxosd.[oh] Krxo* osd core AFS_component_version_number.c osddb* policy_parser.c