From 9987cb6cc35463eaf87d209e741aacf5c621d894 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Tue, 21 Jan 2014 14:59:59 -0500 Subject: [PATCH] Search srcdir and objdir paths for rxkad includes The addition of rxkad-k5 support in 1.6.5 introduced dependencies on rxkad to the auth and afsauthent libraries. However, the rxkad headers used are both source files and generated files, so we must add both the source and build tree rxkad directories to the include search path. This is a 1.6-only change, since on master we are using libtool and do not need to reach into other parts of the source tree to rebuild certain files into these libraries. Change-Id: I819095a3e0ac259bba43205d0462659cbd2c6f03 Reviewed-on: http://gerrit.openafs.org/10736 Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Stephan Wiesand Tested-by: Stephan Wiesand --- src/auth/Makefile.in | 2 +- src/libafsauthent/Makefile.in | 2 +- src/shlibafsauthent/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index c1cf575f6..1110b6928 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -69,7 +69,7 @@ akimpersonate.o: akimpersonate.c ${INCLS} ${CCOBJ} ${CFLAGS} -c ${srcdir}/akimpersonate.c @KRB5_CPPFLAGS@ akimpersonate_v5gen.o: akimpersonate_v5gen.c ${INCLS} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/akimpersonate_v5gen.c @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad + ${CCOBJ} ${CFLAGS} -c ${srcdir}/akimpersonate_v5gen.c @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad -I../rxkad userok.o: userok.c ${INCLS} cellconfig.o: cellconfig.c ${INCLS} diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index 6cc645aab..2204e7bc7 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -154,7 +154,7 @@ akimpersonate.o: ${AUTH}/akimpersonate.c ${CCRULE} -I../auth @KRB5_CPPFLAGS@ akimpersonate_v5gen.o: ${AUTH}/akimpersonate_v5gen.c - ${CCRULE} -I../auth @KRB5_CPPFLAGS@ -I../rxkad + ${CCRULE} -I../auth @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad -I../rxkad ktc_errors.o: ${AUTH}/ktc_errors.c ${CCRULE} diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index 6d6a86bb2..923bdb617 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -206,7 +206,7 @@ akimpersonate.o: ${AUTH}/akimpersonate.c ${CCRULE} @KRB5_CPPFLAGS@ akimpersonate_v5gen.o: ${AUTH}/akimpersonate_v5gen.c - ${CCRULE} @KRB5_CPPFLAGS@ -I../rxkad + ${CCRULE} @KRB5_CPPFLAGS@ -I${srcdir}/../rxkad -I../rxkad ktc_errors.o: ${AUTH}/ktc_errors.c ${CCRULE} -- 2.39.5