Build system: MT_LIBS includes XLIBS

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

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 9925db8..4e7319c 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -20,31 +20,34 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@
 # Programs
 #
 
-AFSLIBS=${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libsys.a \
-       ${TOP_LIBDIR}/libafsutil.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
-       $(TOP_LIBDIR)/libopr.a
-
-UAFSLIBS=${TOP_LIBDIR}/libuafs.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libopr.a
+AFSLIBS=$(top_builddir)/src/auth/liboafs_auth.la \
+       $(top_builddir)/src/cmd/liboafs_cmd.la \
+       $(top_builddir)/src/sys/liboafs_sys.la \
+       $(top_builddir)/src/util/liboafs_util.la \
+       $(top_builddir)/src/opr/liboafs_opr.la
+
+UAFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
+        ${TOP_LIBDIR}/libuafs.a \
+        $(top_builddir)/src/cmd/liboafs_cmd.la \
+        $(top_builddir)/src/util/liboafs_util.la \
+        $(top_builddir)/src/opr/liboafs_opr.la
 
 FUSE_LIBS=@FUSE_LIBS@
 
 LDFLAGS_afsd = $(AFSD_LDFLAGS)
 afsd: afsd.o afsd_kernel.o $(AFSLIBS) $(AFSD_LIBS)
-       ${AFS_LDRULE} afsd.o afsd_kernel.o $(NON_SHARED) \
-               $(AFSLIBS) ${AFSD_LIBS} $(LIB_roken) $(XLIBS)
+       $(LT_LDRULE_static) afsd.o afsd_kernel.o $(NON_SHARED) \
+               $(AFSLIBS) ${AFSD_LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS)
 
 LDFLAGS_afsd.fuse = $(AFSD_LDFLAGS)
 afsd.fuse: afsd_fuse.o $(UAFSLIBS) $(AFSD_LIBS)
-       ${AFS_LDRULE} afsd_fuse.o $(NON_SHARED) \
-               $(UAFSLIBS) $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) \
-               ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS}
+       $(LT_LDRULE_static) afsd_fuse.o $(NON_SHARED) \
+               $(UAFSLIBS) $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) $(LIB_crypt) \
+               ${FUSE_LIBS} ${AFSD_LIBS}
 
 vsys: vsys.o
        ${AFS_LDRULE} vsys.o ${TOP_LIBDIR}/libsys.a \
-               $(LIB_roken) ${XLIBS}
+               $(LIB_roken) $(MT_LIBS)
 
 #
 # Objects
@@ -60,6 +63,7 @@ afsd_fuse.o: afsd_fuse.c AFS_component_version_number.c
 vsys.o: vsys.c AFS_component_version_number.c
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o vsys afsd afsd.fuse core AFS_component_version_number.c
 
 system: install