From 1b4f1648e925dab43cbad53c31d56be355de233a Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 17 Feb 2010 13:46:23 +0000 Subject: [PATCH] Unix: Fix objdir builds Make some changes to the Unix build system so that object directory builds work again. In particular, change the way that we call xcodebuild on Darwin, so that source and binary can live in different places. Change-Id: Ib2ab6182deaf7f344603cb5618707d3f212a5b86 Reviewed-on: http://gerrit.openafs.org/1339 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/platform/DARWIN/Makefile.in | 12 ++++++------ src/rxkad/crc.c | 2 +- src/rxkad/md4.c | 2 +- src/rxkad/md5.c | 2 +- src/shlibafsrpc/Makefile.in | 22 +++++++++++----------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/platform/DARWIN/Makefile.in b/src/platform/DARWIN/Makefile.in index a472af6bc..96fe1bd7f 100644 --- a/src/platform/DARWIN/Makefile.in +++ b/src/platform/DARWIN/Makefile.in @@ -23,20 +23,20 @@ afscell/InstallerSections.plist: afscell OpenAFS.prefPane: @case ${SYS_NAME} in \ *_darwin_100 ) \ - xcodebuild -sdk macosx10.6 -project AFSPreference/OpenAFS.xcodeproj ;; \ + xcodebuild -sdk macosx10.6 -project ${srcdir}/AFSPreference/OpenAFS.xcodeproj SYMDIR=`pwd`/AFSPreference/build;; \ *_darwin_90 ) \ - xcodebuild -sdk macosx10.5 -project AFSPreference/OpenAFS.xcodeproj ;; \ + xcodebuild -sdk macosx10.5 -project ${srcdir}/AFSPreference/OpenAFS.xcodeproj SYMDIR=`pwd`/AFSPreference/build;; \ *_darwin_80 ) \ - xcodebuild -sdk macosx10.4 -project AFSPreference/OpenAFS.xcodeproj ;; \ + xcodebuild -sdk macosx10.4 -project ${srcdor}/AFSPreference/OpenAFS.xcodeproj SYMDIR=`pwd`/AFSPreference/build;; \ * ) \ echo Not building AFS prefPane for ${SYS_NAME} ;; \ esac afscell: - cd afscell && xcodebuild + xcodebuild -project ${srcdir}/afscell/afscell.xcodeproj SYMROOT=`pwd`/afscell/build afssettings: afssettings.m - ${CC} ${CFLAGS} -o afssettings afssettings.m -framework Foundation + ${CC} ${CFLAGS} -o afssettings $? -framework Foundation install: \ ${DESTDIR}${sbindir}/afssettings @@ -69,5 +69,5 @@ ${DEST}/tools/OpenAFS.prefPane: AFSPreference/build/Release/OpenAFS.prefPane clean: $(RM) -rf OpenAFS.prefPane $(RM) -rf AFSPreference/build + $(RM) -rf afscell/build $(RM) -f *.o core afssettings AFS_component_version_number.c - @cd afscell && xcodebuild clean diff --git a/src/rxkad/crc.c b/src/rxkad/crc.c index de9cf4dd2..e9f5d78fe 100644 --- a/src/rxkad/crc.c +++ b/src/rxkad/crc.c @@ -61,9 +61,9 @@ #include #include #include +#include #include #include "lifetimes.h" -#include "rxkad.h" #endif /* defined(UKERNEL) */ static u_long table[256]; diff --git a/src/rxkad/md4.c b/src/rxkad/md4.c index 890426dd4..1738b9047 100644 --- a/src/rxkad/md4.c +++ b/src/rxkad/md4.c @@ -58,9 +58,9 @@ #include #include #include +#include #include #include "lifetimes.h" -#include "rxkad.h" #endif /* defined(UKERNEL) */ diff --git a/src/rxkad/md5.c b/src/rxkad/md5.c index d699c1932..0910063c5 100644 --- a/src/rxkad/md5.c +++ b/src/rxkad/md5.c @@ -57,9 +57,9 @@ #endif #include #include +#include #include #include "lifetimes.h" -#include "rxkad.h" #endif /* defined(UKERNEL) */ diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index f39640359..b5d37161e 100644 --- a/src/shlibafsrpc/Makefile.in +++ b/src/shlibafsrpc/Makefile.in @@ -27,7 +27,7 @@ SFLAGS=-P -I${TOP_INCDIR} RX = ../rx CCRULE = ${CC} ${CFLAGS} -c $? -RXKAD = ../rxkad +RXKAD = $(srcdir)/../rxkad RXSTAT = ../rxstat FSINT = ../fsint DES = ../des @@ -209,16 +209,16 @@ rx_multi.o: ${RX}/rx_multi.c ${CCRULE} rxkad_client.o: ${RXKAD}/rxkad_client.c - ${CCRULE} + ${CCRULE} -I../rxkad rxkad_server.o: ${RXKAD}/rxkad_server.c - ${CCRULE} + ${CCRULE} -I../rxkad rxkad_common.o: ${RXKAD}/rxkad_common.c - ${CCRULE} + ${CCRULE} -I../rxkad ticket.o: ${RXKAD}/ticket.c - ${CCRULE} + ${CCRULE} -I ../rxkad ticket5.o: ${RXKAD}/ticket5.c ${CCRULE} -I../rxkad -I${RXKAD} @@ -236,7 +236,7 @@ fcrypt.o: ${RXKAD}/domestic/fcrypt.c ${CCRULE} -I../rxkad -I${RXKAD} crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c - ${CCRULE} + ${CCRULE} -I../rxkad -I${RXKAD} AFS_component_version_number.o: ${RX}/AFS_component_version_number.c ${CCRULE} @@ -311,10 +311,10 @@ des.o: ${DES}/des.c case ${SYS_NAME} in \ hp_ux11*) \ set X `echo ${CCRULE} | sed s/-g//`; shift; \ - "$$@" \ + "-I../des $$@" \ ;; \ *) \ - ${CCRULE} \ + ${CCRULE} -I../des \ ;; \ esac @@ -334,7 +334,7 @@ new_rnd_key.o: ${DES}/new_rnd_key.c ${CCRULE} key_sched.o: ${DES}/key_sched.c - ${CCRULE} + ${CCRULE} -I../des debug_decl.o: ${DES}/debug_decl.c ${CCRULE} @@ -343,7 +343,7 @@ quad_cksum.o: ${DES}/quad_cksum.c ${CCRULE} key_parity.o: ${DES}/key_parity.c - ${CCRULE} + ${CCRULE} -I../des weak_key.o: ${DES}/weak_key.c ${CCRULE} @@ -430,7 +430,7 @@ afscbint.xdr.o: ${FSINT}/afscbint.xdr.c ${CCRULE} afsaux.o: ${FSINT}/afsaux.c - ${CCRULE} + ${CCRULE} -I../fsint clean: $(RM) -f *.o libafsrpc.a* libafsrpc.sl* libafsrpc.so* libafsrpc_pic.a libafsrpc.dylib.* -- 2.39.5