X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Flibafs%2FMakefileProto.DARWIN.in;h=e2bc64eab8653d0bf59d9d3eee11b102fdee4022;hp=16b4e0d7cc6e393dc70a44d2c916f47c4597df0e;hb=e62e3c9b661d6dcdebe7f29ee0906f788be893b8;hpb=4a31f02b1f271caa63b3274fb3d0f413d4757002

diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in
index 16b4e0d..e2bc64e 100644
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@@ -7,6 +7,9 @@ DEST=@DEST@
 TOP_INCDIR=@TOP_INCDIR@
 TOP_LIBDIR=@TOP_LIBDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
+TOP_OBJDIR=@TOP_OBJDIR@
+srcdir=@srcdir@
+VPATH=${srcdir}
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
@@ -20,6 +23,7 @@ afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
 afskerneldir=@afskerneldir@
 SYS_NAME=@AFS_SYSNAME@
+DARWIN_INFOFILE=../@DARWIN_INFOFILE@
 
 include config/Makefile.${SYS_NAME}
 
@@ -46,14 +50,12 @@ AFS_OS_NONFSOBJS = osi_vfsops.o
 
 # System specific build commands and flags
 KDEFS=
-DBUG = -g
+DBUG = 
 DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL
-OPTF=${OPT} 
-OPTF2=${OPT2} 
-KOPTS=-traditional-cpp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
+KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
 #CFLAGS=-Werror-implicit-function-declaration -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 #CFLAGS=-framework Kernel -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ}
 
 
 # Name of directory to hold object files and libraries.
@@ -69,47 +71,46 @@ include Makefile.common
 setup:
 	-mkdir $(KOBJ)
 	-$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
-	ln -s ../Makefile $(KOBJ)/Makefile
-	ln -s ../Makefile.common $(KOBJ)/Makefile.common
-	ln -s ../config $(KOBJ)/config
+	ln -fs ../Makefile $(KOBJ)/Makefile
+	ln -fs ../Makefile.common $(KOBJ)/Makefile.common
+	ln -fs ../config $(KOBJ)/config
 	-$(RM) -f  h net netinet rpc ufs nfs  machine sys vm mach kern
-	-ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/net net
-	-ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/machine machine
-	-ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/netinet netinet
-	-ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/nfs nfs
-	-ln -s /usr/include/rpc rpc
-	-ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys sys
-	-ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/ufs ufs
-	-ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys h
+	-ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/net net
+	-ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/machine machine
+	-ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/netinet netinet
+	-ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/nfs nfs
+	-ln -fs /usr/include/rpc rpc
+	-ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys sys
+	-ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/ufs ufs
+	-ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys h
 
 
 # Below this line are targets when in the COMMON directory:
 LIBAFS = libafs.o
 LIBAFSNONFS = libafs.nonfs.o
 
-INST_LIBAFS = ${DESTDIR}${afskerneldir}/afs-nfs
-INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/afs
-DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs-nfs
-DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs
+INST_LIBAFS = ${DESTDIR}${afskerneldir}/afs-nfs.kext
+INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/afs.kext
+DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/afs-nfs.kext
+DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/afs.kext
 
 
 libafs: $(LIBAFSNONFS) ;
-install_libafs: $(INST_LIBAFSNONFS) ;
-dest_libafs: $(DEST_LIBAFSNONFS) ;
+install_libafs: $(LIBAFSNONFS) ;
+	-mkdir -p ${INST_LIBAFSNONFS}
+	-mkdir -p ${INST_LIBAFSNONFS}/Contents
+	$(INSTALL) -f ${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist
+	-mkdir -p ${INST_LIBAFSNONFS}/Contents/MacOS
+	$(INSTALL) -f ${LIBAFSNONFS} ${INST_LIBAFSNONFS}/Contents/MacOS/afs
+
+dest_libafs: $(LIBAFSNONFS) ;
+	-mkdir -p ${DEST_LIBAFSNONFS}
+	-mkdir -p ${DEST_LIBAFSNONFS}/Contents
+	$(INSTALL) -f ${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist
+	-mkdir -p ${DEST_LIBAFSNONFS}/Contents/MacOS
+	$(INSTALL) -f ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}/Contents/MacOS/afs
 
 
-$(INST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
-
-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
-
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 	$(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS}