vlserver: Remove sascnvldb

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

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index cfc212e..08fd556 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -7,8 +7,8 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.lwp
+include @TOP_OBJDIR@/src/config/Makefile.lwptool
 
 ENABLE_PTHREADED_UBIK = @ENABLE_PTHREADED_UBIK@
 
@@ -35,10 +35,10 @@ LIBS=\
        ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a \
        $(TOP_LIBDIR)/libopr.a \
+       ${TOP_LIBDIR}/libafsrfc3961.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
-LT_objs = vldbint.xdr.lo vldbint.cs.lo vl_errors.lo \
-         AFS_component_version_number.lo
+LT_objs = vldbint.xdr.lo vldbint.cs.lo vl_errors.lo
 
 LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \
          $(top_builddir)/src/rx/liboafs_rx.la \
@@ -47,7 +47,8 @@ LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \
 all: \
        vlserver vlclient cnvldb vlserver cnvldb vldb_check \
        Kvldbint.cs.c Kvldbint.xdr.c vldbint.h \
-       liboafs_vldb.la ${TOP_LIBDIR}/libvldb.a depinstall
+       liboafs_vldb.la libvlserver_pic.la \
+       ${TOP_LIBDIR}/libvldb.a depinstall
 
 generated: \
        vl_errors.c vlserver.h \
@@ -59,7 +60,7 @@ depinstall: \
        ${TOP_INCDIR}/afs/vl_opcodes.h \
        ${TOP_INCDIR}/afs/vlserver.h \
        ${TOP_INCDIR}/afs/vldbint.h \
-       ${TOP_INCDIR}/afs/cnvldb.h 
+       ${TOP_INCDIR}/afs/cnvldb.h
 
 ${TOP_LIBDIR}/libvldb.a: libvldb.a
        ${INSTALL_DATA} $? $@
@@ -86,11 +87,6 @@ cnvldb: cnvldb.o ${LIBS}
 
 cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o
 
-sascnvldb: sascnvldb.o ${LIBS}
-       $(AFS_LDRULE) sascnvldb.o ${LIBS} $(LIB_roken) ${XLIBS}
-
-sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o
-
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.lo $(LIBS)
        $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
                .lwp/vldbint.xdr.o \
@@ -132,6 +128,9 @@ libvldb.a: $(LT_objs)
 liboafs_vldb.la: liboafs_vldb.la.sym $(LT_objs) $(LT_deps)
        $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
 
+libvlserver_pic.la: $(LT_objs)
+       $(LT_LDLIB_pic) $(LT_objs)
+
 vlclient: vlclient.o libvldb.a $(LIBS)
        $(AFS_LDRULE) vlclient.o libvldb.a \
                $(LIBS) ${TOP_LIBDIR}/libcmd.a $(LIB_roken) ${XLIBS}
@@ -139,8 +138,19 @@ vlclient: vlclient.o libvldb.a $(LIBS)
 vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o
 
 vl_errors.o: vl_errors.c
-vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
-       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir} vl_errors -h vlserver
+
+vl_errors.c: vl_errors.et
+       ${COMPILE_ET_C} -p ${srcdir} vl_errors
+
+vlserver.h : vl_errors.et vlserver.p.h
+       ${COMPILE_ET_H} -p ${srcdir} vl_errors -h vlserver
+
+cnvldb.o cnvldb.lo: vlserver.h
+vlclient.o vlclient.lo: vlserver.h
+vldb_check.o vldb_check.lo: vlserver.h
+vlprocs.o vlprocs.lo: vlserver.h
+vlserver.o vlserver.lo: vlserver.h
+vlutils.o vlutils.lo: vlserver.h
 
 vlserver.o: vlserver.c