voldump-builds-with-volser-20030827

avoid circular dependancy issue.

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index 81368a6..18ba917 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -30,7 +30,6 @@ all: gi \
        ${TOP_LIBDIR}/libvlib.a \
        salvager \
        volinfo \
-       voldump \
        $(FS_CONV_OSF40D) \
        $(XFS_SIZE_CHECK) \
        $(FS_CONV_SOL26) \
@@ -52,7 +51,6 @@ install: \
        ${DESTDIR}${libdir}/afs/libvlib.a \
        ${DESTDIR}${afssrvlibexecdir}/salvager \
        ${DESTDIR}${afssrvsbindir}/volinfo \
-       ${DESTDIR}${afssrvsbindir}/voldump \
        $(install_FS_CONV_OSF40D) \
        $(install_XFS_SIZE_CHECK) \
        $(install_FS_CONV_SOL26) \
@@ -164,10 +162,6 @@ volinfo: vol-info.o physio.o ihandle.o ${LIBS}
        ${CC} ${CFLAGS} -o volinfo vol-info.o physio.o \
                ihandle.o ${LIBS} ${XLIBS}
 
-voldump: vol-dump.o physio.o ihandle.o ${LIBS}
-       ${CC} ${CFLAGS} -o voldump vol-dump.o physio.o \
-                ihandle.o ${LIBS} ${XLIBS}
-
 fs_conv_dux40D: fs_conv_411.o
        ${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} ${XLIBS}
 
@@ -185,7 +179,7 @@ xfs_size_check: xfs_size_check.c
 #
 clean:
        $(RM) -f *.o *.a AFS_component_version_number.c
-       $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo voldump gi fs_conv_sol26 fs_conv_dux40D
+       $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D
 
 test:
        cd test; $(MAKE)
@@ -209,9 +203,6 @@ ${DESTDIR}${afssrvlibexecdir}/salvager: salvager
 ${DESTDIR}${afssrvsbindir}/volinfo: volinfo
        ${INSTALL} -s $? $@
 
-${DESTDIR}${afssrvsbindir}/voldump: voldump
-       ${INSTALL} -s $? $@
-
 ${DESTDIR}${includedir}/afs/nfs.h: nfs.h
        ${INSTALL} $? $@
 
@@ -271,7 +262,6 @@ dest: \
        ${DEST}/lib/afs/libvlib.a \
        ${DEST}/root.server/usr/afs/bin/salvager \
        ${DEST}/root.server/usr/afs/bin/volinfo \
-       ${DEST}/root.server/usr/afs/bin/voldump \
        $(dest_FS_CONV_OSF40D) \
        $(dest_XFS_SIZE_CHECK) \
        $(dest_FS_CONV_SOL26) \

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index f5d6db9..44bc734 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -39,11 +39,22 @@ LIBS=\
        ${TOP_LIBDIR}/libusd.a \
        ${TOP_LIBDIR}/util.a
 
+VOLDUMP_LIBS = \
+       ../vol/ihandle.o \
+       ../vol/physio.o \
+       ../vol/vlib.a \
+       ${TOP_LIBDIR}/libcmd.a \
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libsys.a \
+       ${TOP_LIBDIR}/libdir.a \
+       ${TOP_LIBDIR}/liblwp.a  \
+       ${TOP_LIBDIR}/libacl.a
+
 VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o 
 SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
  volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o
 
-all: volserver vos restorevol \
+all: volserver vos restorevol voldump \
        ${TOP_INCDIR}/afs/volser.h \
        ${TOP_INCDIR}/afs/volint.h \
        ${TOP_LIBDIR}/libvolser.a
@@ -59,6 +70,9 @@ volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a
        ${CC} ${DBUG} -o volserver $(SOBJS) ${TOP_LIBDIR}/libdir.a \
                ${LDFLAGS} $(LIBS) ${XLIBS}
 
+voldump: vol-dump.o ${VOLDUMP_LIBS}
+       ${CC} ${CFLAGS} -o voldump vol-dump.o ${VOLDUMP_LIBS} ${XLIBS}
+
 libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
        -$(RM) -f $@
        $(AR) crv $@ volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o 
@@ -106,6 +120,7 @@ lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS}
 #
 install: \
        ${DESTDIR}${sbindir}/restorevol \
+       ${DESTDIR}${sbindir}/voldump \
        ${DESTDIR}${includedir}/afs/volser.h \
        ${DESTDIR}${includedir}/afs/volint.h \
        ${DESTDIR}${sbindir}/vos \
@@ -123,6 +138,9 @@ ${DEST}/include/afs/volint.h: volint.h
 ${DEST}/etc/restorevol: restorevol
        ${INSTALL} $? $@
 
+${DEST}/etc/voldump: voldump
+       ${INSTALL} $? $@
+
 ${DEST}/etc/vos ${DEST}/root.server/usr/afs/bin/vos: vos
        ${INSTALL} $? $@
 
@@ -137,13 +155,16 @@ ${DEST}/root.server/usr/afs/bin/volserver: volserver
 # 
 clean:
        $(RM) -f *.o *.a core volserver volint.ss.c volint.cs.c volint.h \
-       volint.xdr.c vos volser.h volerr.c AFS_component_version_number.c restorevol
+       volint.xdr.c vos volser.h volerr.c AFS_component_version_number.c restorevol voldump
 
 include ../config/Makefile.version
 
 ${DESTDIR}${sbindir}/restorevol: restorevol
        ${INSTALL} $? $@
 
+${DESTDIR}${sbindir}/voldump: voldump
+       ${INSTALL} $? $@
+
 ${DESTDIR}${includedir}/afs/volser.h: volser.h
        ${INSTALL} $? $@
 
@@ -173,6 +194,7 @@ ${TOP_LIBDIR}/libvolser.a: libvolser.a
 
 dest: \
        ${DEST}/etc/restorevol \
+       ${DEST}/etc/voldump \
        ${DEST}/include/afs/volser.h \
        ${DEST}/include/afs/volint.h \
        ${DEST}/etc/vos \

diff --git a/src/vol/vol-dump.c b/src/volser/vol-dump.c
similarity index 99%
rename from src/vol/vol-dump.c
rename to src/volser/vol-dump.c
index cdb2430..39a1edd 100644 (file)
--- a/src/vol/vol-dump.c
+++ b/src/volser/vol-dump.c
@@ -48,7 +48,6 @@ RCSID
 #include "volume.h"
 #include "partition.h"
 #include "viceinode.h"
-#include "volinodes.h"
 #include <afs/afssyscalls.h>
 #include "acl.h"