Catch up on FBSD releases

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

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index 928e8af..0e682af 100644 (file)
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -7,15 +7,21 @@
 #
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 
 # OS specific object files:
 AFS_OS_OBJS = \
+       osi_gcpags.o \
        osi_groups.o \
        osi_file.o \
        osi_inode.o \
        osi_misc.o \
        osi_sleep.o \
+       osi_vcache.o \
        osi_vm.o \
        osi_vnodeops.o \
        osi_module.o 
@@ -30,23 +36,21 @@ AFS_OS_NONFSOBJS = \
 # System specific build commands and flags
 KSRC = @BSD_KERNEL_PATH@
 KBLD = @BSD_KERNEL_BUILD@
-KDEFS=-Wall -ansi -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
-       -elf -mpreferred-stack-boundary=2 -fformat-extensions \
-<i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
-       -include ${KBLD}/opt_global.h \
+<amd64>
+KOPTS = -fPIC -mno-red-zone
+<all>
+
+KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
+       -elf \
 <i386_fbsd_60>
        -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
-<all -i386_fbsd_42 -i386_fbsd_43 -i386_fbsd_44 -i386_fbsd_45 -i386_fbsd_46 -i386_fbsd_47>
-       -mno-align-long-strings -fno-common -ffreestanding \
-       -I${KBLD} -include opt_global.h -fno-strict-aliasing \
 <all>
-
+       -mno-align-long-strings -fno-common -ffreestanding \
+       -I${KBLD} -include opt_global.h -fno-strict-aliasing
 
 DBUG = -O2
 #DBUG = -O -g
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
-OPTF=${OPT} 
-OPTF2=${OPT2} 
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 
@@ -70,7 +74,11 @@ setup:
        -ln -fs ${KSRC}/@HOST_CPU@/include machine
        -ln -fs ${KSRC}/netinet netinet
        -ln -fs ${KSRC}/nfs nfs
+<all -fbsd_71 -fbsd_72 -fbsd_72 -fbsd_73 -fbsd_74 -fbsd_80 -fbsd_81 -fbsd_82 -fbsd_90>
        -ln -fs /usr/include/rpc rpc
+<fbsd_71 fbsd_72 fbsd_73 fbsd_74 fbsd_80 fbsd_81 fbsd_82 fbsd_90>
+       -ln -fs ${KSRC}/rpc rpc
+<all>
        -ln -fs ${KSRC}/sys sys
        -ln -fs ${KSRC}/ufs/ufs ufs
        -ln -fs ${KSRC}/sys h
@@ -96,31 +104,14 @@ DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS}
 
 # libafs:      $(LIBAFS) $(LIBAFSNONFS)
 libafs:        $(LIBAFSNONFS)
-# install_libafs:      $(INST_LIBAFS) $(INST_LIBAFSNONFS)
-install_libafs:        $(INST_LIBAFSNONFS)
-# dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSNONFS)
-dest_libafs:   $(DEST_LIBAFSNONFS)
-#libafs:
-#      echo WARNING: No kernel module for ${SYS_NAME}
-
-#install_libafs:
-#      echo WARNING: No kernel module for ${SYS_NAME}
 
-#dest_libafs:
-#      echo WARNING: No kernel module for ${SYS_NAME}
+install_libafs:        $(LIBAFSNONFS)
+       ${INSTALL} -d ${DESTDIR}${afskerneldir}
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)
 
-
-$(INST_LIBAFS): $(LIBAFS)
-       $(INSTALL) -f $? $@
-
-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-       $(INSTALL) -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-       $(INSTALL) -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-       $(INSTALL) -f $? $@
+dest_libafs: $(LIBAFSNONFS)
+       ${INSTALL} -d ${DEST}/root.client/bin
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
 
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(LD) -r -o ${LIBAFS}.kld ${AFSAOBJS} ${AFSNFSOBJS}
@@ -129,17 +120,10 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(LD) -Bshareable -o ${LIBAFS} setdef0.o ${LIBAFS}.kld setdef1.o
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
-<i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
-       $(LD) -r -o libafs.kld ${AFSAOBJS} ${AFSNONFSOBJS}
-       gensetdefs libafs.kld
-       $(MAKE) setdef0.o setdef1.o
-       $(LD) -Bshareable -o ${LIBAFSNONFS} setdef0.o libafs.kld setdef1.o
-<all -i386_fbsd_42 -i386_fbsd_43 -i386_fbsd_44 -i386_fbsd_45 -i386_fbsd_46 -i386_fbsd_47>
        $(LD) -r -d -warn-common -o libafs.kld ${AFSAOBJS} ${AFSNONFSOBJS}
        touch export_syms
        awk -f ${KSRC}/conf/kmod_syms.awk libafs.kld export_syms | xargs -J% objcopy % libafs.kld
        $(LD) -Bshareable -d -warn-common -o ${LIBAFSNONFS} libafs.kld
-<all>
 
 
 # Object build rules:
@@ -149,10 +133,6 @@ setdef1.o: setdef1.c
        $(CRULE_NOOPT)
 
 # vnode_if.h build rules:
-<i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
-vnode_if.h:    ${KSRC}/kern/vnode_if.src
-       perl5 ${KSRC}/kern/vnode_if.pl -h ${KSRC}/kern/vnode_if.src
-<all -i386_fbsd_42 -i386_fbsd_43 -i386_fbsd_44 -i386_fbsd_45 -i386_fbsd_46 -i386_fbsd_47>
 vnode_if.h:    ${KSRC}/kern/vnode_if.src
        awk -f ${KSRC}/tools/vnode_if.awk ${KSRC}/kern/vnode_if.src -h
        awk -f ${KSRC}/tools/vnode_if.awk ${KSRC}/kern/vnode_if.src -q