install-vlib-as-libvlib-also-20010712

[openafs.git] / src / vol / Makefile

diff --git a/src/vol/Makefile b/src/vol/Makefile
index 127e338..6baabcf 100644 (file)
--- a/src/vol/Makefile
+++ b/src/vol/Makefile
@@ -10,8 +10,7 @@ COMPONENT=vol
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version
 
-INCDIRS= -I. -I${DESTDIR}include ${FSINCLUDES}
-INSTALL = ${SRCDIR}bin/install
+INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}include ${FSINCLUDES}
 LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
 
 LIBS= ${DESTDIR}lib/afs/libcmd.a vlib.a ${SRCDIR}lib/afs/util.a \
@@ -33,6 +32,7 @@ VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \
 OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o 
 
 all:   ${DESTDIR}lib/afs/vlib.a \
+       ${DESTDIR}lib/afs/libvlib.a \
        ${DESTDIR}root.server/usr/afs/bin/salvager \
        ${DESTDIR}root.server/usr/afs/bin/volinfo \
        gi
@@ -51,6 +51,9 @@ ${DESTDIR}root.server/usr/afs/bin/volinfo: volinfo
 ${DESTDIR}lib/afs/vlib.a: vlib.a
        ${INSTALL} $? $@
 
+${DESTDIR}lib/afs/libvlib.a: vlib.a
+       ${INSTALL} $? $@
+
 $(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D:  fs_conv_dux40D
           ${INSTALL} -s $? $@
 
@@ -77,17 +80,7 @@ vlib.a:      ${VLIBOBJS} AFS_component_version_number.o
 
 # new salvager:  remove references to /vice by linking with novice.o
 salvager: vol-salvage.o physio.o vlib.a
-       case ${SYS_NAME} in \
-                *linux* ) \
-                        ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o \
-                               ${LIBS}  ;; \
-                sgi_* ) \
-                        ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o \
-                               ${LIBS} ../sgiefs/libefs.a ;; \
-                *) \
-                        ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o \
-                               ${LIBS};; \
-        esac
+       ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o ${LIBS}
 
 vol-salvage: vol-salvage.o
 vol-info: vol-info.o physio.o ihandle.o
@@ -103,7 +96,7 @@ listinodes.o: listinodes.c AFS_component_version_number.c
 
 gi: ${DESTDIR}/lib/afs/libsys.a
        case ${SYS_NAME} in \
-                *linux* | sgi_* ) \
+                *linux* | sgi_* | *fbsd* ) \
                        echo "Don't build gi on ${SYS_NAME}";; \
                 *) \
                        ${CC} ${CFLAGS} -c gi.c ; \
@@ -112,7 +105,7 @@ gi: ${DESTDIR}/lib/afs/libsys.a
 
 volinfo: vol-info.o physio.o ihandle.o
        case ${SYS_NAME} in \
-               *linux*) \
+               *linux* | *fbsd*) \
                        ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \
                                ihandle.o ${LIBS}  ;; \
                *) \
@@ -135,7 +128,8 @@ xfs_size_check: xfs_size_check.c
 
 clean:
        rm -f *.o *.a AFS_component_version_number.c
-       rm -f ${SCMPROGS} ${STAGEPROGS} core
+       rm -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D
+
 
 beancount:
        wc -l *.c *.h