DAFS: allow salvager to detect whether FSYNC server is DAFS

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

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index a8b7dcb..e409f73 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -21,7 +21,7 @@ MODULE_CFLAGS = -DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_CLIENT \
                -DSALVSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT \
                -DAFS_DEMAND_ATTACH_FS
 
-SCFLAGS=$(COMMON_CFLAGS) -I.. -DNINTERFACE ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT
+SCFLAGS=$(COMMON_CFLAGS) -I.. -DNINTERFACE ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS
 
 SCCRULE=${MT_CC} ${SCFLAGS} -c $? -o $@
 
@@ -50,11 +50,19 @@ FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIROB
 
 SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libcmd.a
+LIBS=   ${TOP_LIBDIR}/libafsauthent.a \
+       ${TOP_LIBDIR}/libafsrpc.a \
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libcmd.a
 
-SLIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \
-       ${TOP_LIBDIR}/libvlib.a ${TOP_LIBDIR}/liblwp.a \
-       ${TOP_LIBDIR}/libacl.a  ${TOP_LIBDIR}/util.a
+SLIBS= ${TOP_LIBDIR}/libcmd.a \
+       ${TOP_LIBDIR}/libdir.a \
+       ${TOP_LIBDIR}/libvlib.a \
+       ${TOP_LIBDIR}/librx.a \
+       ${TOP_LIBDIR}/liblwp.a \
+       ${TOP_LIBDIR}/libsys.a \
+       ${TOP_LIBDIR}/libacl.a \
+       ${TOP_LIBDIR}/util.a
 
 all: salvageserver dafssync-debug salvsync-debug dasalvager
 
@@ -172,16 +180,20 @@ namei_ops.o: ${VOL}/namei_ops.c
        $(AFS_CCRULE) $(VOL)/namei_ops.c
 
 salvageserver: ${OBJECTS} ${LIBS}
-       $(AFS_LDRULE) ${OBJECTS} ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(AFS_LDRULE) ${OBJECTS} ${LIBS} \
+               $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 dasalvager: ${SOBJECTS} ${SLIBS}
-       $(AFS_LDRULE) ${SOBJECTS} ${SLIBS} ${XLIBS}
+       $(AFS_LDRULE) ${SOBJECTS} ${SLIBS} \
+               $(LIB_roken) ${XLIBS}
 
 dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS}
-       $(AFS_LDRULE) ${FSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(AFS_LDRULE) ${FSSDEBUG_OBJS} ${LIBS} \
+               $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS}
-       $(AFS_LDRULE) ${SSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(AFS_LDRULE) ${SSSDEBUG_OBJS} ${LIBS} \
+               $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 install: salvageserver dafssync-debug salvsync-debug dasalvager
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}