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 dc51f259d89029ce095ef89f746c8d8ef387c032..8e5017dd10e10e6f0b5b4e5dd231f6db5a484e40 100644 (file)
--- 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 d197b6b305333748be9f1747d7f6e8678e451d3c..7e3a777624b585ab122f147485c72ac2b46aecf5 100644 (file)
--- 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 6363b5e9577eba7f19c45fc2cf6cce279dbe4978..3f7223c84aac8d9cc7985199af8f909a965539fa 100644 (file)
--- 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 aaa870bdc83b4e16917b9a5a0c6c7d020b124295..42dcfc06e915add2d099e9c5b4c3d5abcbbe67a6 100644 (file)
--- 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}