Fixed out-of-tree builds.

The problems were
* wrong location of Makefile.version-CML
* lots of omissions of "$?" in favor of actual file names in Makefiles
* wrong dependencies in pam/Makefile.in

The latter now point to TOP_INCDIR. Still, ktc.c could not be built
from src/pam (buildtree), as include "..." would not work on generated
headers. Therefore, it uses include <...> where appropriate now.

Reviewed-on: http://gerrit.openafs.org/http://gerrit.openafs.org/155
Tested-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index 29820beb01a426b8d1dd0a81c4994569cda201a2..0841a6c1f4a0865829dde09992bb5752b1b9b51a 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -50,25 +50,25 @@ depinstall: afszcm.cat AFS_component_version_number.c \
        ${TOP_INCDIR}/afs/sysctl.h
 
 ${TOP_INCDIR}/afs/afs.h: afs.h
-       ${INSTALL_DATA} afs.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/afs_stats.h: afs_stats.h
-       ${INSTALL_DATA} afs_stats.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/exporter.h: exporter.h
-       ${INSTALL_DATA} exporter.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/nfsclient.h: nfsclient.h
-       ${INSTALL_DATA} nfsclient.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h
-       ${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/sysctl.h: sysctl.h
-       ${INSTALL_DATA} sysctl.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/unified_afs.h: unified_afs.h
-       ${INSTALL_DATA} unified_afs.h $@
+       ${INSTALL_DATA} $? $@
 
 install: unified_afs.h
        ${INSTALL} -d ${DESTDIR}${includedir}/afs

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 97eb7950e0868caa8a0d32a53872e5aa8cb0c3b2..9d488cdd3ddb8d9470b4408f16c8a813c71781ff 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -34,16 +34,16 @@ depinstall: ${TOP_INCDIR}/afs/keys.h \
        ${TOP_INCDIR}/afs/ktc.h
 
 ${TOP_INCDIR}/afs/keys.h: keys.h
-       ${INSTALL_DATA} keys.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/cellconfig.h: cellconfig.h
        ${INSTALL_DATA} cellconfig.h $@
 
 ${TOP_INCDIR}/afs/auth.h: auth.h
-       ${INSTALL_DATA} auth.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/ktc.h: ktc.h
-       ${INSTALL_DATA} ktc.h $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_LIBDIR}/libauth.a: libauth.a
        ${INSTALL_DATA} libauth.a $@

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 3c4a2ffa0eaab2f6c2684d4c88fa5adc3c3693b0..080493927f013d7c1ebefbbed8578a7c79dc9902 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -63,7 +63,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "auth.h"
+#include <afs/auth.h>
 #include <afs/venus.h>
 #include <afs/afsutil.h>
 #include <afs/sys_prototypes.h>
@@ -82,7 +82,7 @@
 #ifdef AFS_KERBEROS_ENV
 #include <fcntl.h>
 #include <sys/file.h>
-#include "cellconfig.h"
+#include <afs/cellconfig.h>
 static char lcell[MAXCELLCHARS];
 
 #define TKT_ROOT "/tmp/tkt"

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index 6c48a14584c5295bc14ea9141580bc26e7a8dc4a..0fcf9e0de0015942f50a9e3307e35ae92b17752d 100644 (file)
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -26,10 +26,10 @@ all: config mkvers \
        ${TOP_INCDIR}/afs/vioc.h \
        ${TOP_INCDIR}/afs/debug.h
 
-Makefile.version: ${srcdir}/Makefile.version-CML Makefile.version-NOCML
+Makefile.version: Makefile.version-CML Makefile.version-NOCML
        $(RM) -f Makefile.version
        if      [ -r @TOP_SRCDIR@/CML/state ] ; \
-       then    $(CP) ${srcdir}/Makefile.version-CML Makefile.version ; \
+       then    $(CP) Makefile.version-CML Makefile.version ; \
        else    $(CP) Makefile.version-NOCML Makefile.version ; \
        fi
 

diff --git a/src/kopenafs/Makefile.in b/src/kopenafs/Makefile.in
index 3f06c0ee507582cdd8f10252d7154749b6dadd3c..ffcb4851a2a8fbc310cc58c2fb4899ac25c2e979 100644 (file)
--- a/src/kopenafs/Makefile.in
+++ b/src/kopenafs/Makefile.in
@@ -41,7 +41,7 @@ ${TOP_LIBDIR}/libkopenafs.a: libkopenafs.a
        ${INSTALL_DATA} libkopenafs.a $@
 
 ${TOP_INCDIR}/kopenafs.h: kopenafs.h
-       ${INSTALL_DATA} kopenafs.h $@
+       ${INSTALL_DATA} $? $@
 
 glue.o: ${SYS}/glue.c ${SYS}/afssyscalls.h
        ${CCOBJ} ${CFLAGS} -c ${SYS}/glue.c

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 020959e672b2c9daae35f7398de22de6d66fe1ce..29d759614ab444c8f26aa2be55efcfb0506a26bd 100644 (file)
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -51,8 +51,8 @@ afs_util.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h
 afs_util_krb.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h
        ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/afs_util.c -o afs_util_krb.o
 
-ktc_krb.o: ${srcdir}/../auth/ktc.c ${srcdir}/../auth/cellconfig.h \
-               ${srcdir}/../auth/auth.h ${srcdir}/../auth/keys.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 $@