From: Andrew Deason <adeason@sinenomine.net>
Date: Fri, 15 Aug 2014 06:34:03 +0000 (-0500)
Subject: objdir build: Add objdir include paths
X-Git-Tag: upstream/1.6.10^2~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e125205aca8248ca7aab8d027a337abef3fc1c56;p=packages%2Fo%2Fopenafs.git

objdir build: Add objdir include paths

In commits ff0644c4cf5a54747bf3af2cc9605163e1debcb7,
3be9a451b523cd955cd5b3e68ee3a44ab083c14f, and
7c451fab11b65dd5e2860715b939e5de33c7645e, some includes were changed
from e.g. <afs/auth.h> to "auth.h". This means that src/auth must be
in the include path for that file. For a file like src/auth/ktc.c,
that's usually fine, since '.' is added to the include path.

However, several of these files are also compiled from different
directories, such as src/libafsauthent. These need to also have the
relevant include path added, or else we cannot include the relevant
file. So, add the needed include paths.

This commit is 1.6-specific. The build system on the master branch
differs greatly, and these files are not build separately in these
directories.

Change-Id: I502b99b9411aff9660b50f0f4d9a4fb4f6a1106a
Reviewed-on: http://gerrit.openafs.org/11392
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: D Brashear <shadow@your-file-system.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index 2204e7bc7..e8961f214 100644
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -139,7 +139,7 @@ cellconfig.o: ${AUTH}/cellconfig.c
 	${CCRULE} -I../auth
 
 ktc.o: ${AUTH}/ktc.c
-	${CCRULE}
+	${CCRULE} -I../auth
 
 userok.o: ${AUTH}/userok.c
 	${CCRULE} -I../auth
@@ -238,7 +238,7 @@ rxkad_errs.o: ${RXKAD}/rxkad_errs.c
 	${CCRULE}
 
 ticket5_keytab.o: ${RXKAD}/ticket5_keytab.c
-	${CCRULE} @KRB5_CPPFLAGS@
+	${CCRULE} -I../rxkad @KRB5_CPPFLAGS@
 
 ptclient.o: ${PTSERVER}/ptclient.c
 	${CCRULE} -I../ptserver
diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 2e721e793..94132446d 100644
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -55,7 +55,7 @@ afs_util_krb.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h
 ktc_krb.o: ${srcdir}/../auth/ktc.c ${TOP_INCDIR}/afs/cellconfig.h \
 		${TOP_INCDIR}/afs/auth.h ${srcdir}/../auth/keys.h \
 		${TOP_INCDIR}/afs/vice.h
-	${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/../auth/ktc.c -o $@
+	${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/../auth/ktc.c -o $@ -I../auth
 
 pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o \
 		${TOP_LIBDIR}/libafsauthent_pic.a \
diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index 923bdb617..94b3037d4 100644
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -308,7 +308,7 @@ rxkad_errs.o: ${RXKAD}/rxkad_errs.c
 	${CCRULE}
 
 ticket5_keytab.o: ${RXKAD}/ticket5_keytab.c
-	${CCRULE} @KRB5_CPPFLAGS@
+	${CCRULE} -I../rxkad @KRB5_CPPFLAGS@
 
 ptclient.o: ${PTSERVER}/ptclient.c
 	${CCRULE}
diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index eb6832ef4..cc6d43f08 100644
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -224,13 +224,13 @@ ticket5.o: ${RXKAD}/ticket5.c
 	${CCRULE} -I../rxkad -I${RXKAD}
 
 crc.o: ${RXKAD}/crc.c
-	${CCRULE}
+	${CCRULE} -I../rxkad
 
 md4.o: ${RXKAD}/md4.c
-	${CCRULE}
+	${CCRULE} -I../rxkad
 
 md5.o: ${RXKAD}/md5.c
-	${CCRULE}
+	${CCRULE} -I../rxkad
 
 fcrypt.o: ${RXKAD}/fcrypt.c
 	${CCRULE} -I../rxkad -I${RXKAD}