From: Jonathan A. Kollasch <jakllsch@kollasch.net>
Date: Tue, 7 Feb 2012 21:23:23 +0000 (-0600)
Subject: libafsauthent, tvolser: fix objdir build
X-Git-Tag: upstream/1.6.2^2~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f55084e5496781dd6dec96ca0882a5ce2de22b4f;p=packages%2Fo%2Fopenafs.git

libafsauthent, tvolser: fix objdir build

Reviewed-on: http://gerrit.openafs.org/6689
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit fb0d056c69489d76a5aad216277bf81ac3420aea)

Change-Id: I30b1e5876e9a91b3caaf9d097fd3a886fabe7e7e
Reviewed-on: http://gerrit.openafs.org/8945
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
---

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index dc51f259d..8e5017dd1 100644
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -293,10 +293,10 @@ vsprocs.o: $(VOLSER)/vsprocs.c
 	$(CCRULE) -I../volser
 
 vsutils.o: $(VOLSER)/vsutils.c
-	$(CCRULE)
+	$(CCRULE) -I../volser
 
 lockprocs.o: $(VOLSER)/lockprocs.c
-	$(CCRULE)
+	$(CCRULE) -I../volser
 
 volint.xdr.o: ../volser/volint.xdr.c
 	$(CCRULE)
diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index d197b6b30..7e3a77762 100644
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -209,7 +209,7 @@ acfg_errors.o: ${AUTH}/acfg_errors.c
 	${CCRULE}
 
 cmd.o: ${CMD}/cmd.c
-	${CCRULE}
+	${CCRULE} -I../cmd
 
 cmd_errors.o: ${CMD}/cmd_errors.c
 	${CCRULE}
diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 6363b5e95..3f7223c84 100644
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -382,7 +382,7 @@ strlcpy.o: ${UTIL}/strlcpy.c
 	${CCRULE}
 
 fasttime.o: ${LWP}/fasttime.c
-	${CCRULE} ${LWP}/fasttime.c
+	${CCRULE}
 
 syscall.o: ${SYS}/syscall.s
 	case "$(SYS_NAME)" in \
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index aaa870bdc..42dcfc06e 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -92,11 +92,11 @@ volint.ss.o: ${VOLSER}/volint.ss.c
 volint.xdr.o: ${VOLSER}/volint.xdr.c
 	${COMPILE}
 vsprocs.o: ${VOLSER}/vsprocs.c
-	${COMPILE}
+	$(COMPILE) -I../volser
 vsutils.o: ${VOLSER}/vsutils.c
-	${COMPILE}
+	${COMPILE} -I../volser
 lockprocs.o: ${VOLSER}/lockprocs.c
-	${COMPILE}
+	${COMPILE} -I../volser
 
 assert.o: ${UTIL}/assert.c
 	${COMPILE}
@@ -225,7 +225,7 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c
 	${COMPILE}
 
 vos.o: ${VOLSER}/vos.c
-	${COMPILE}
+	${COMPILE} -I../volser
 
 vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
 	${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a ${MT_LIBS} ${XLIBS}