git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Install DAFS and non-DAFS fssync-debug
[openafs.git] / src / vol / Makefile.in
diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index 6cdb059..10e7d88 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -9,6 +9,10 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 
 
@@ -18,8 +22,8 @@ LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \
 
 CFLAGS = ${COMMON_CFLAGS} -D${SYS_NAME} ${FSINCLUDES} ${XCFLAGS} ${ARCHFLAGS} -DFSSYNC_BUILD_SERVER -DFSSYNC_BUILD_CLIENT
 
-PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h voldefs.h partition.h \
-       fssync.h ihandle.h namei_ops.h salvsync.h daemon_com.h
+PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h volume_inline.h voldefs.h partition.h \
+       fssync.h ihandle.h namei_ops.h salvsync.h daemon_com.h vnode_inline.h
 
 VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync-server.o fssync-client.o \
         clone.o nuke.o devname.o listinodes.o common.o ihandle.o purge.o \
@@ -34,18 +38,20 @@ all: gi \
        volinfo \
        fssync-debug \
        $(XFS_SIZE_CHECK) \
-       $(FS_CONV_SOL26) \
        ${TOP_INCDIR}/afs/nfs.h \
        ${TOP_INCDIR}/afs/vnode.h \
+       ${TOP_INCDIR}/afs/vnode_inline.h \
        ${TOP_INCDIR}/afs/viceinode.h \
        ${TOP_INCDIR}/afs/volume.h \
+       ${TOP_INCDIR}/afs/volume_inline.h \
        ${TOP_INCDIR}/afs/voldefs.h \
        ${TOP_INCDIR}/afs/partition.h \
        ${TOP_INCDIR}/afs/fssync.h \
        ${TOP_INCDIR}/afs/salvsync.h \
        ${TOP_INCDIR}/afs/daemon_com.h \
        ${TOP_INCDIR}/afs/ihandle.h \
-       ${TOP_INCDIR}/afs/namei_ops.h
+       ${TOP_INCDIR}/afs/namei_ops.h \
+       ${TOP_INCDIR}/afs/vol_prototypes.h
 
 ${TOP_LIBDIR}/vlib.a: vlib.a
        ${INSTALL_DATA} $? $@
@@ -59,12 +65,18 @@ ${TOP_INCDIR}/afs/nfs.h: nfs.h
 ${TOP_INCDIR}/afs/vnode.h: vnode.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/afs/vnode_inline.h: vnode_inline.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/afs/viceinode.h: viceinode.h
        ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/volume.h: volume.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/afs/volume_inline.h: volume_inline.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/afs/voldefs.h: voldefs.h
        ${INSTALL_DATA} $? $@
 
@@ -92,6 +104,9 @@ ${TOP_INCDIR}/afs/salvage.h: salvage.h
 ${TOP_INCDIR}/afs/vol-salvage.h: vol-salvage.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/afs/vol_prototypes.h: vol_prototypes.h
+       ${INSTALL_DATA} $? $@
+
 #
 # Installation targets
 #
@@ -104,10 +119,13 @@ install: vlib.a salvager volinfo fssync-debug
        ${INSTALL_DATA} vlib.a ${DESTDIR}${libdir}/afs/libvlib.a
        ${INSTALL_PROGRAM} salvager ${DESTDIR}${afssrvlibexecdir}/salvager
        ${INSTALL_PROGRAM} volinfo ${DESTDIR}${afssrvsbindir}/volinfo
+       ${INSTALL_PROGRAM} fssync-debug ${DESTDIR}${afssrvsbindir}/fssync-debug
        ${INSTALL_DATA} nfs.h ${DESTDIR}${includedir}/afs/nfs.h
        ${INSTALL_DATA} vnode.h ${DESTDIR}${includedir}/afs/vnode.h
+       ${INSTALL_DATA} vnode_inline.h ${DESTDIR}${includedir}/afs/vnode_inline.h
        ${INSTALL_DATA} viceinode.h ${DESTDIR}${includedir}/afs/viceinode.h
        ${INSTALL_DATA} volume.h ${DESTDIR}${includedir}/afs/volume.h
+       ${INSTALL_DATA} volume_inline.h ${DESTDIR}${includedir}/afs/volume_inline.h
        ${INSTALL_DATA} voldefs.h ${DESTDIR}${includedir}/afs/voldefs.h
        ${INSTALL_DATA} partition.h ${DESTDIR}${includedir}/afs/partition.h
        ${INSTALL_DATA} fssync.h ${DESTDIR}${includedir}/afs/fssync.h
@@ -115,18 +133,10 @@ install: vlib.a salvager volinfo fssync-debug
        ${INSTALL_DATA} daemon_com.h ${DESTDIR}${includedir}/afs/daemon_com.h
        ${INSTALL_DATA} ihandle.h ${DESTDIR}${includedir}/afs/ihandle.h
        ${INSTALL_DATA} namei_ops.h ${DESTDIR}${includedir}/afs/namei_ops.h
-       set -x; if test "@DEMAND_ATTACH@" = "no" ; then \
-               ${INSTALL_PROGRAM} fssync-debug \
-                       ${DESTDIR}${afssrvsbindir}/fssync-debug ; \
-       fi
        set -x; if test x"$(install_XFS_SIZE_CHECK)" != x"" ; then \
                ${INSTALL_PROGRAM} xfs_size_check \
                        ${DESTDIR}${afssrvsbindir}/xfs_size_check ; \
        fi
-       set -x; if test x"$(install_FS_CONV_SOL26)" != x"" ; then \
-               ${INSTALL_PROGRAM} fs_conv_sol26 \
-                       ${DESTDIR}${afssrvsbindir}/fs_conv_sol26 ; \
-       fi
 
 dest: vlib.a salvager volinfo fssync-debug
        ${INSTALL} -d ${DEST}/lib/afs
@@ -136,10 +146,13 @@ dest: vlib.a salvager volinfo fssync-debug
        ${INSTALL_DATA} vlib.a ${DEST}/lib/afs/libvlib.a
        ${INSTALL_PROGRAM} salvager ${DEST}/root.server/usr/afs/bin/salvager
        ${INSTALL_PROGRAM} volinfo ${DEST}/root.server/usr/afs/bin/volinfo
+       ${INSTALL_PROGRAM} fssync-debug ${DEST}/root.server/usr/afs/bin/fssync-debug
        ${INSTALL_DATA} nfs.h ${DEST}/include/afs/nfs.h
        ${INSTALL_DATA} vnode.h ${DEST}/include/afs/vnode.h
+       ${INSTALL_DATA} vnode_inline.h ${DEST}/include/afs/vnode_inline.h
        ${INSTALL_DATA} viceinode.h ${DEST}/include/afs/viceinode.h
        ${INSTALL_DATA} volume.h ${DEST}/include/afs/volume.h
+       ${INSTALL_DATA} volume_inline.h ${DEST}/include/afs/volume_inline.h
        ${INSTALL_DATA} voldefs.h ${DEST}/include/afs/voldefs.h
        ${INSTALL_DATA} partition.h ${DEST}/include/afs/partition.h
        ${INSTALL_DATA} fssync.h ${DEST}/include/afs/fssync.h
@@ -147,18 +160,10 @@ dest: vlib.a salvager volinfo fssync-debug
        ${INSTALL_DATA} daemon_com.h ${DEST}/include/afs/daemon_com.h
        ${INSTALL_DATA} ihandle.h ${DEST}/include/afs/ihandle.h
        ${INSTALL_DATA} namei_ops.h ${DEST}/include/afs/namei_ops.h
-       set -x; if test "@DEMAND_ATTACH@" = "no" ; then \
-               ${INSTALL_PROGRAM} fssync-debug \
-                       ${DEST}/root.server/usr/afs/bin/fssync-debug ; \
-       fi
        set -x; if test x"$(install_XFS_SIZE_CHECK)" != x"" ; then \
                ${INSTALL_PROGRAM} xfs_size_check \
                        $(DEST)/root.server/usr/afs/bin/xfs_size_check ; \
        fi
-       set -x; if test x"$(install_FS_CONV_SOL26)" != x"" ; then \
-               ${INSTALL_PROGRAM} fs_conv_sol26 \
-                       $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 ; \
-       fi
 
 #
 # Build targets
@@ -169,6 +174,9 @@ vol-salvage.o vutil.o: volinodes.h
 vol-salvage.o salvager.o: vol-salvage.h
 vol-salvage.o: salvsync.h daemon_com.h
 
+salvager.o: salvager.c
+       $(CC) $(CFLAGS) -c $<
+
 vlib.a:        ${VLIBOBJS} AFS_component_version_number.o
        $(RM) -f $@
        $(AR) crv $@ ${VLIBOBJS} AFS_component_version_number.o
@@ -178,6 +186,8 @@ vlib.a:     ${VLIBOBJS} AFS_component_version_number.o
 salvager: vol-salvage.o physio.o vlib.a salvager.o ${LIBS}
        ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o salvager.o ${LIBS} ${XLIBS}
 
+salvager.o: AFS_component_version_number.c
+
 vol-salvage: vol-salvage.o
 vol-info: vol-info.o physio.o ihandle.o
 
@@ -215,12 +225,6 @@ fssync-debug: fssync-debug.o physio.o AFS_component_version_number.c ${LIBS}
 vol-bless: vol-bless.o physio.o ihandle.o ${LIBS}
        ${CC} ${CFLAGS} -o vol-bless vol-bless.o physio.o ${LIBS} ${XLIBS}
 
-fs_conv_sol26: fs_conv_411.o ${LIBS}
-       ${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} ${XLIBS}
-
-fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c ${srcdir}/fs_conv_411.c
-
 xfs_size_check: xfs_size_check.c
        ${CC} ${CFLAGS} -o xfs_size_check ${srcdir}/xfs_size_check.c
 
@@ -229,7 +233,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 gi fs_conv_sol26 fs_conv_dux40D
+       $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fssync-debug
 
 test:
        cd test; $(MAKE)
OpenAFS Master Repository