From: Benjamin Kaduk <kaduk@mit.edu>
Date: Mon, 7 Apr 2014 21:55:09 +0000 (-0400)
Subject: vol: Fix build with separate objdir
X-Git-Tag: upstream/1.6.10_pre1^2~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=22eddf1c63dea6267e8cd9ee9a0d90c5fd9978b3;p=packages%2Fo%2Fopenafs.git

vol: Fix build with separate objdir

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>
---

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index 7af01e0da..603cb7dc2 100644
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -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}