objdir-libafs-ko-20040607

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

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 10a4e55..620de50 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -35,6 +35,12 @@ COMMON_DEFINES=-D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
 LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@
 
 # System specific build commands and flags
+<i386_linux26>
+# All the platform-specific and kernel-related things are provided by
+# the kernel build system.  So we should _not_ use COMMON_KERN_CFLAGS!
+CCFLAGS = -Wno-strict-prototypes
+DEFINES = $(COMMON_DEFINES)
+
 <i386_linux22 i386_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@
 DEFINES = $(COMMON_DEFINES) -DCPU=586
@@ -82,7 +88,8 @@ CCFLAGS = $(COMMON_KERN_CFLAGS) -ffixed-r13 -mfixed-range=f10-f15,f32-f127 -fali
 DEFINES = $(COMMON_DEFINES)
 
 <all>
-INCLUDES = -I. -I../ -I${TOP_OBJDIR}/src/config
+INCLUDES = -I. -I../ -I${TOP_OBJDIR}/src/config \
+  -I${TOP_SRCDIR}/rx -I${TOP_OBJDIR}/src/rxstat
 
 CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES)
 
@@ -97,6 +104,12 @@ DESTDIRS=linux_destdirs
 
 include Makefile.common
 
+<i386_linux26>
+LINUX_MODULE_EXT=ko
+<all -i386_linux26>
+LINUX_MODULE_EXT=o
+<all>
+
 LINUX_MODULE_NAME=
 LOCAL_SMP_DEF=
 
@@ -106,7 +119,7 @@ setup:
        for m in ${MPS} ; do \
                KDIR=$(KOBJ)-${LINUX_VERSION}${LINUX_MODULE_NAME}-$$m; \
                mkdir -p $${KDIR}; \
-               ln -fs ../Makefile $${KDIR}/Makefile ; \
+               ln -fs ../Makefile $${KDIR}/Makefile.afs ; \
                ln -fs ../Makefile.common $${KDIR}/Makefile.common; \
                ln -fs ../config $${KDIR}/config; \
        done 
@@ -167,8 +180,9 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                        TARG=libafs ; \
                fi ; \
                cd $${KDIR} ; \
-               $(MAKE) SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} || exit $$?; \
+               $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} || exit $$?; \
                cd ../ ; \
+<all>
        done
 
 linux_compdirs_libafs: depsrcs libafs
@@ -187,10 +201,10 @@ linux_destdirs_libafs.bm: dest_libafs.bm
 
 # Below this line are targets when in the COMMON directory:
 # For Linux there is no kernel NFS server.
-LIBAFS = libafs-${CLIENT}.o
-LIBAFS_MP = libafs-${CLIENT}.mp.o
-LIBAFS_EP = libafs-${CLIENT}.ep.o
-LIBAFS_BM = libafs-${CLIENT}.bm.o
+LIBAFS = libafs-${CLIENT}.${LINUX_MODULE_EXT}
+LIBAFS_MP = libafs-${CLIENT}.mp.${LINUX_MODULE_EXT}
+LIBAFS_EP = libafs-${CLIENT}.ep.${LINUX_MODULE_EXT}
+LIBAFS_BM = libafs-${CLIENT}.bm.${LINUX_MODULE_EXT}
 
 INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS}
 INST_LIBAFS_MP = ${DESTDIR}${afskerneldir}/${LIBAFS_MP}
@@ -215,6 +229,17 @@ libafs.ep: $(LIBAFS_EP)
 libafs.bm: $(LIBAFS_BM)
        echo BM Build Complete
 
+<i386_linux26>
+${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko
+       cp libafs.ko $@
+
+.FORCE:
+libafs.ko: .FORCE
+       ../$(srcdir)/make_kbuild_makefile.pl ${KDIR} $@ \
+         @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
+       $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
+        
+<all -i386_linux26>
 ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS)
        $(RM) -f $@
        $(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
@@ -230,6 +255,7 @@ ${LIBAFS_EP}: $(AFSAOBJS) $(AFSNONFSOBJS)
 ${LIBAFS_BM}: $(AFSAOBJS) $(AFSNONFSOBJS)
        $(RM) -f $@
        $(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
+<all>
 
 install_libafs:        $(INST_LIBAFS) 
        echo SP Install Complete