Clean up our cleaning

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

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index e7d594e..88812b2 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -15,7 +15,6 @@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT
 
 VLSERVER=$(srcdir)/../vlserver
-LIBACL=$(srcdir)/../libacl
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 VOLSER=$(srcdir)/../volser
@@ -24,26 +23,19 @@ VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstu
 
 VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o
 
-VOSOBJS= vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o volint.cs.o
-
-LIBACLOBJS=aclprocs.o netprocs.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
         clone.o devname.o common.o ihandle.o listinodes.o \
         namei_ops.o nuke.o salvsync-client.o daemon_com.o
 
-objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-        ${DIROBJS} ${VOLOBJS}
+objects= ${VOLSEROBJS} ${DIROBJS} ${VOLOBJS}
 
-vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
-       ${VOLOBJS}
+vosobjects= ${VLSERVEROBJS} ${DIROBJS} ${VOLOBJS}
 
 LIBS_common = \
        $(top_builddir)/src/sys/liboafs_sys.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
-       ${TOP_LIBDIR}/libafsauthent.a   \
        $(top_builddir)/src/util/liboafs_util.la      \
        $(top_builddir)/src/usd/liboafs_usd.la          \
        $(top_builddir)/src/rx/liboafs_rx.la \
@@ -54,10 +46,12 @@ LIBS_common = \
 
 LIBS_client = \
        $(top_builddir)/src/ubik/liboafs_ubik.la \
+       $(top_builddir)/src/volser/liboafs_volser.la \
        $(LIBS_common)
 
 LIBS_server = \
        $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+       $(top_builddir)/src/libacl/liboafs_acl.la \
        $(LIBS_common)
 
 all: volserver vos
@@ -92,24 +86,21 @@ volint.ss.o: ../volser/volint.ss.c
 volint.xdr.o: ../volser/volint.xdr.c
        $(AFS_CCRULE) ../volser/volint.xdr.c
 
-vsprocs.o: ${VOLSER}/vsprocs.c
-       $(AFS_CCRULE) -I../volser $(VOLSER)/vsprocs.c
-
-vsutils.o: ${VOLSER}/vsutils.c
-       $(AFS_CCRULE) -I../volser $(VOLSER)/vsutils.c
-
 lockprocs.o: ${VOLSER}/lockprocs.c
        $(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c
 
-aclprocs.o: ${LIBACL}/aclprocs.c
-       $(AFS_CCRULE) $(LIBACL)/aclprocs.c
-
-netprocs.o: ${LIBACL}/netprocs.c
-       $(AFS_CCRULE) $(LIBACL)/netprocs.c
+vl_errors.c: ${VLSERVER}/vl_errors.et
+       ${COMPILE_ET_C} -p ${VLSERVER} vl_errors
 
-vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
-       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
+vlserver.h: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
+       ${COMPILE_ET_H} -p ${VLSERVER} 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
 
 vldbint.cs.o: ../vlserver/vldbint.cs.c
        $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c
@@ -203,6 +194,7 @@ dest: volserver
 
 clean:
        $(LT_CLEAN)
-       $(RM) -f *.o volserver core AFS_component_version_number.c
+       $(RM) -f *.o vos volserver core AFS_component_version_number.c \
+               vl_errors.c vlserver.h
 
 include ../config/Makefile.version