Move restorevol to bin from sbin

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

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index f9576d8..872dd4d 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -56,13 +56,17 @@ VOLDUMP_LIBS = \
 
 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
+ volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vol_split.o
 
 all: volserver vos restorevol voldump \
        ${TOP_INCDIR}/afs/volser.h \
+       ${TOP_INCDIR}/afs/vsutils_prototypes.h \
        ${TOP_INCDIR}/afs/volint.h \
        ${TOP_LIBDIR}/libvolser.a
 
+${TOP_INCDIR}/afs/vsutils_prototypes.h: vsutils_prototypes.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/afs/volser.h: volser.h
        ${INSTALL_DATA} $? $@
 
@@ -91,21 +95,23 @@ libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
        $(AR) crv $@ volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o 
        $(RANLIB) $@
 
-volser.h volerr.c: volerr.et volser.p.h
+volser.h: volerr.c
+
+volerr.c: volerr.et volser.p.h
        $(RM) -f volser.h volerr.c
        ${COMPILE_ET} -p ${srcdir} volerr -h volser
 
 volint.cs.c: volint.xg
-       ${RXGEN} -x -C -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -C -o $@ ${srcdir}/volint.xg
 
 volint.ss.c: volint.xg
-       ${RXGEN} -x -S -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -S -o $@ ${srcdir}/volint.xg
 
 volint.xdr.c: volint.xg
-       ${RXGEN} -x -c -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -c -o $@ ${srcdir}/volint.xg
 
 volint.h: volint.xg
-       ${RXGEN} -x -h -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -h -o $@ ${srcdir}/volint.xg
 
 volint.cs.c: volint.h
 volint.ss.c: volint.h
@@ -118,7 +124,7 @@ volint.cs.o: volint.cs.c ${INTINCLS}
 volint.ss.o: volint.ss.c ${INTINCLS}
 volint.xdr.o: volint.xdr.c ${INTINCLS}
 vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
-volmain.o: volmain.c ${VINCLS} ${RINCLS} AFS_component_version_number.c
+volmain.o: volmain.c ${VINCLS} ${RINCLS} ${INTINCLS} AFS_component_version_number.c
 volprocs.o: volprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
 dumpstuff.o: dumpstuff.c ${VINCLS} ${RINCLS} ${INTINCLS}
 voldump.o: voldump.c ${VINCLS} ${RINCLS}
@@ -127,6 +133,7 @@ vsprocs.o: vsprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
 physio.o: physio.c ${VINCLS}
 common.o: common.c ${VINCLS}
 lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS}
+vol_split.o: vol_split.c ${VINCLS} ${INTINCLS} ${RINCLS}
 
 #
 # Installation targets
@@ -137,10 +144,11 @@ install: restorevol voldump volser.h volint.h vos volserver libvolser.a
        ${INSTALL} -d ${DESTDIR}${includedir}/afs
        ${INSTALL} -d ${DESTDIR}${libdir}/afs
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-       ${INSTALL_PROGRAM} restorevol ${DESTDIR}${sbindir}/restorevol
+       ${INSTALL_PROGRAM} restorevol ${DESTDIR}${bindir}/restorevol
        ${INSTALL_PROGRAM} voldump ${DESTDIR}${sbindir}/voldump
        ${INSTALL_DATA} volser.h ${DESTDIR}${includedir}/afs/volser.h
        ${INSTALL_DATA} volint.h ${DESTDIR}${includedir}/afs/volint.h
+       ${INSTALL_DATA} vsutils_prototypes.h ${DESTDIR}${includedir}/afs/vsutils_prototypes.h
        ${INSTALL_PROGRAM} vos ${DESTDIR}${sbindir}/vos
        ${INSTALL_PROGRAM} vos ${DESTDIR}${afssrvsbindir}/vos
        ${INSTALL_DATA} libvolser.a ${DESTDIR}${libdir}/afs/libvolser.a
@@ -148,16 +156,16 @@ install: restorevol voldump volser.h volint.h vos volserver libvolser.a
        alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
                echo "Don't install volserver for ${SYS_NAME}" ;; \
        *_darwin_[1-6][0-9]) \
-               echo ${INSTALL_PROGRAM} volserver \
+               echo ${INSTALL} volserver \
                        ${DESTDIR}${afssrvlibexecdir}/volserver ; \
-               ${INSTALL_PROGRAM} volserver \
+               ${INSTALL} volserver \
                        ${DESTDIR}${afssrvlibexecdir}/volserver ;; \
        *_darwin_*) \
                echo "Don't install volserver for ${SYS_NAME}" ;; \
        *) \
                echo ${INSTALL_PRORAM} volserver \
                        ${DESTDIR}${afssrvlibexecdir}/volserver ; \
-               ${INSTALL_PROGRAM} volserver \
+               ${INSTALL} volserver \
                        ${DESTDIR}${afssrvlibexecdir}/volserver ;; \
        esac
 
@@ -170,6 +178,7 @@ dest: restorevol voldump volser.h volint.h vos volserver libvolser.a
        ${INSTALL_PROGRAM} voldump ${DEST}/etc/voldump
        ${INSTALL_DATA} volser.h ${DEST}/include/afs/volser.h
        ${INSTALL_DATA} volint.h ${DEST}/include/afs/volint.h
+       ${INSTALL_DATA} vsutils_prototypes.h ${DEST}/include/afs/vsutils_prototypes.h
        ${INSTALL_PROGRAM} vos ${DEST}/etc/vos
        ${INSTALL_PROGRAM} vos ${DEST}/root.server/usr/afs/bin/vos
        ${INSTALL_DATA} libvolser.a ${DEST}/lib/afs/libvolser.a
@@ -177,16 +186,16 @@ dest: restorevol voldump volser.h volint.h vos volserver libvolser.a
        alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
                echo "Don't install volserver for ${SYS_NAME}" ;; \
        *_darwin_[1-6][0-9]) \
-               echo ${INSTALL_PROGRAM} volserver \
+               echo ${INSTALL} volserver \
                        ${DEST}/root.server/usr/afs/bin/volserver ; \
-               ${INSTALL_PROGRAM} -ns volserver \
+               ${INSTALL} -ns volserver \
                        ${DEST}/root.server/usr/afs/bin/volserver ;; \
        *_darwin_*) \
                echo "Don't install volserver for ${SYS_NAME}" ;; \
        *) \
-               echo ${INSTALL_PROGRAM} volserver \
+               echo ${INSTALL} volserver \
                        ${DEST}/root.server/usr/afs/bin/volserver ; \
-               ${INSTALL_PROGRAM} volserver \
+               ${INSTALL} volserver \
                        ${DEST}/root.server/usr/afs/bin/volserver ;; \
        esac
 
@@ -202,6 +211,6 @@ check-splint::
            vos.c restorevol.c \
            vsprocs.c vsutils.c lockprocs.c volerr.c \
            volmain.c volprocs.c physio.c common.c voltrans.c \
-           dumpstuff.c
+           dumpstuff.c vol_split.c
 
 include ../config/Makefile.version