From 22eddf1c63dea6267e8cd9ee9a0d90c5fd9978b3 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Mon, 7 Apr 2014 17:55:09 -0400 Subject: [PATCH] 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 Tested-by: Benjamin Kaduk Reviewed-by: Jeffrey Altman (cherry picked from commit 074d745a02d80bfd2c16a4e2b7b4222022f8e641) Change-Id: I3f29fcfb0257e145e0aae62ba425ccd7df513a72 Reviewed-on: http://gerrit.openafs.org/11279 Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/vol/Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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} -- 2.39.5