darwin-optimize-and-fix-dirpath-20010920

[openafs.git] / src / libafs / MakefileProto.DARWIN.in

diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in
index b3894b9..4d4a949 100644 (file)
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@@ -3,12 +3,26 @@
 # 
 # MakefileProto for Digital Unix systems
 #
-DESTDIR=@DESTDIR@
-SRCDIR=@SRCDIR@
+DEST=@DEST@
+TOP_INCDIR=@TOP_INCDIR@
+TOP_LIBDIR=@TOP_LIBDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+sbindir=@sbindir@
+libexecdir=@libexecdir@
+libdir=@libdir@
+includedir=@includedir@
+mandir=@mandir@
+afssrvbindir=@afssrvbindir@
+afssrvsbindir=@afssrvsbindir@
+afssrvlibexecdir=@afssrvlibexecdir@
+afskerneldir=@afskerneldir@
 SYS_NAME=@AFS_SYSNAME@
+DARWIN_INFOFILE=../@DARWIN_INFOFILE@
 
-include ../config/Makefile.${SYS_NAME}
+include config/Makefile.${SYS_NAME}
 
 
 # OS specific object files:
@@ -22,7 +36,8 @@ AFS_OS_OBJS = \
        osi_vnodeops.o \
        osi_module.o \
        xdr.o \
-       xdr_array.o
+       xdr_array.o \
+       xdr_int64.o
 
 
 #AFS_OS_NFSOBJS = osi_vfsops_nfs.o
@@ -32,14 +47,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_SRCDIR}/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ}
 
 
 # Name of directory to hold object files and libraries.
@@ -47,15 +60,18 @@ KOBJ = MODLOAD
 
 # This tells Makefile.common to use it's single directory build target.
 COMPDIRS = single_compdir
+INSTDIRS = single_instdir
+DESTDIRS = single_destdir
 
 include Makefile.common
 
 setup:
        -mkdir $(KOBJ)
-       -rm $(KOBJ)/Makefile $(KOBJ)/Makefile.common
+       -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
        ln -s ../Makefile $(KOBJ)/Makefile
        ln -s ../Makefile.common $(KOBJ)/Makefile.common
-       -rm -f  h net netinet rpc ufs nfs  machine sys vm mach kern
+       ln -s ../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
@@ -70,18 +86,27 @@ setup:
 LIBAFS = libafs.o
 LIBAFSNONFS = libafs.nonfs.o
 
-DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs-nfs
-DEST_LIBAFSNONFS = ${DESTDIR}/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: $(DEST_LIBAFSNONFS) ;
+libafs: $(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
 
-$(DEST_LIBAFS): $(LIBAFS)
-       $(INSTALL) -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-       $(INSTALL) -f $? $@
 
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS}
@@ -112,7 +137,8 @@ osi_vnodeops.o: $(AFS)/osi_vnodeops.c
 osi_module.o: $(AFS)/osi_module.c
        $(CRULE1)
 xdr.o: $(RX)/xdr.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_array.o: $(RX)/xdr_array.c
-       $(CRULE1);
-
+       $(CRULE1)
+xdr_int64.o: $(RX)/xdr_int64.c
+       $(CRULE1)