]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
vol: Fix build with separate objdir
authorBenjamin Kaduk <kaduk@mit.edu>
Mon, 7 Apr 2014 21:55:09 +0000 (17:55 -0400)
committerStephan Wiesand <stephan.wiesand@desy.de>
Wed, 13 Aug 2014 18:52:48 +0000 (14:52 -0400)
The volscan-main and volinfo-main source files are in the source
tree, not the object tree; refer to the objects in the Makefile
as dependencies, so that they will be picked up properly.  The
objects will be made just fine by the implicit .c.o rule.

Reviewed-on: http://gerrit.openafs.org/10988
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 074d745a02d80bfd2c16a4e2b7b4222022f8e641)

Change-Id: I3f29fcfb0257e145e0aae62ba425ccd7df513a72
Reviewed-on: http://gerrit.openafs.org/11279
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
src/vol/Makefile.in

index 7af01e0da457b5f09b2e6244c2c957caef0f1356..603cb7dc2dbda6b468e24e9059c85b0cfd27f46f 100644 (file)
@@ -220,12 +220,12 @@ gi: ${TOP_LIBDIR}/libsys.a
 namei_map: ${TOP_LIBDIR}/libsys.a namei_map.o
        ${CC} ${CFLAGS} -o namei_map namei_map.o ${TOP_LIBDIR}/libafsutil.a ${LIBS} ${XLIBS}
 
-volinfo: volinfo-main.c vol-info.o physio.o ihandle.o ${LIBS}
-       ${CC} ${CFLAGS} -o volinfo volinfo-main.c vol-info.o physio.o \
+volinfo: volinfo-main.o vol-info.o physio.o ihandle.o ${LIBS}
+       ${CC} ${CFLAGS} -o volinfo volinfo-main.o vol-info.o physio.o \
                ihandle.o ${LIBS} ${XLIBS}
 
-volscan: volscan-main.c vol-info.o physio.o ihandle.o ${LIBS}
-       ${CC} ${CFLAGS} -o volscan volscan-main.c vol-info.o physio.o \
+volscan: volscan-main.o vol-info.o physio.o ihandle.o ${LIBS}
+       ${CC} ${CFLAGS} -o volscan volscan-main.o vol-info.o physio.o \
                ihandle.o ${LIBS} ${XLIBS}
 
 fssync-debug: fssync-debug.o physio.o AFS_component_version_number.c ${LIBS}