util: Convert to using libtool

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

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 973c10a..96b545d 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -8,7 +8,7 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-include @TOP_OBJDIR@/src/config/Makefile.lwp
+include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 
 #
@@ -20,39 +20,39 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@
 # Programs
 #
 
-AFSLIBS=${TOP_LIBDIR}/libauth.a \
-       ${TOP_LIBDIR}/libcmd.a \
+AFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
+       ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libsys.a \
-       ${TOP_LIBDIR}/util.a \
-       ${TOP_LIBDIR}/librx.a \
-       ${TOP_LIBDIR}/liblwp.a \
-       ${TOP_LIBDIR}/util.a \
-       $(TOP_LIBDIR)/libopr.a
+       $(top_builddir)/src/util/liboafs_util.la \
+       ${TOP_LIBDIR}/libafsrpc.a \
+       $(top_builddir)/src/opr/liboafs_opr.la
 
-UAFSLIBS=${TOP_LIBDIR}/libuafs.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a
+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_roken) $(MT_LIBS) $(XLIBS)
 
 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) \
+       $(LT_LDRULE_static) afsd_fuse.o $(NON_SHARED) \
+               $(UAFSLIBS) $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) $(LIB_crypt) \
                ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS}
 
 vsys: vsys.o
        ${AFS_LDRULE} vsys.o ${TOP_LIBDIR}/libsys.a \
-               $(LIB_roken) ${XLIBS}
+               $(LIB_roken) $(MT_LIBS) ${XLIBS}
 
 #
 # Objects
 #
-CFLAGS_afsd.o        = @CFLAGS_NOERROR@
-CFLAGS_afsd_kernel.o = @CFLAGS_NOERROR@
 CFLAGS_afsd_fuse.o   = -I${TOP_SRCDIR}/afs -I${TOP_SRCDIR}/afs/UKERNEL \
                       -I${TOP_SRCDIR}/rx/UKERNEL -DUKERNEL @FUSE_CFLAGS@