freebsd-cleanup-20090112

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

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index 709492f..e10e464 100644 (file)
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -34,23 +34,28 @@ 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 \
+<amd64_fbsd_70 amd64_fbsd_71 amd64_fbsd_80>
+KOPTS = -fPIC
+<all>
+
+KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
+       -elf \
 <i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
+       -mpreferred-stack-boundary=2 \
+       -fformat-extensions \
        -include ${KBLD}/opt_global.h \
+<i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
+       -include ${KBLD}/opt_global.h -mpreferred-stack-boundary=2 \
 <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 \
+       -I${KBLD} -include opt_global.h -fno-strict-aliasing
 <all>
 
-
 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}
 
 
@@ -74,7 +79,11 @@ setup:
        -ln -fs ${KSRC}/@HOST_CPU@/include machine
        -ln -fs ${KSRC}/netinet netinet
        -ln -fs ${KSRC}/nfs nfs
+<all -fbsd_71 -fbsd_80>
        -ln -fs /usr/include/rpc rpc
+<fbsd_71 fbsd_80>
+       -ln -fs ${KSRC}/rpc rpc
+<all>
        -ln -fs ${KSRC}/sys sys
        -ln -fs ${KSRC}/ufs/ufs ufs
        -ln -fs ${KSRC}/sys h