Linux: Remove prototype warning inhibition

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

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 823928b..e3d9369 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -8,6 +8,12 @@
 srcdir=@srcdir@
 
 include @TOP_OBJDIR@/src/config/Makefile.config
+
+<linux24 linux_24 linux22 linux_22 linux20 linux_20>
+# Override for Linux 2.4 and older
+MKAFS_OSTYPE=LINUX24
+<all>
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -17,6 +23,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 AFS_OS_OBJS = \
        osi_alloc.o \
        osi_cred.o \
+       osi_gcpags.o \
        osi_groups.o \
        osi_inode.o \
        osi_file.o \
@@ -37,11 +44,16 @@ AFS_OS_OBJS = \
        osi_ioctl.o \
        osi_proc.o \
 <all>
-       osi_vnodeops.o 
+       osi_vnodeops.o \
+<linux26 linux_26>
+       osi_pagecopy.o \
+       osi_fetchstore.o
+<all>
 
 AFS_OS_PAGOBJS = \
        osi_alloc.o \
        osi_cred.o \
+       osi_gcpags.o \
        osi_groups.o \
        osi_inode.o \
        osi_misc.o \
@@ -70,7 +82,7 @@ LINUX_KERNEL_BUILD=@LINUX_KERNEL_BUILD@
 <linux26 linux_26>
 # 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
+CCFLAGS =
 DEFINES = $(COMMON_DEFINES)
 
 # CFLAGS_* and AFLAGS_* will be copied into the kbuild makefile
@@ -168,9 +180,32 @@ setup:
 
 # Compile SP and MP clients as requested
 
-${INSTDIRS}:
+${INSTDIRS} ${DESTDIRS}: ${COMPDIRS}
+       if [ "${LINUX_KERNEL_PACKAGING}" ] ; then \
+           TARGPREFIX="pack_"; \
+       fi ; \
+       for m in ${MPS} ; do \
+               KDIR=${KOBJ}-${LINUX_VERSION}${LINUX_MODULE_NAME}-$$m ; \
+               echo Building in directory: $${KDIR} ; \
+               if [ "$$m" = "MP" ] ; then \
+                       SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \
+                       TARG="libafs.mp" ; \
+               elif [ "$$m" = "EP" ] ; then \
+                       SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \
+                       TARG="libafs.ep" ; \
+               elif [ "$$m" = "BM" ] ; then \
+                       SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \
+                       TARG="libafs.bm" ; \
+               else  \
+                       SMP_DEF="@RHCONFIG_SP@ ${LOCAL_SMP_DEF}" ; \
+                       TARG=libafs ; \
+               fi ; \
+               cd $${KDIR} ; \
+               $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" $@_$${TARGPREFIX}$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} || exit $$?; \
+               cd ../ ; \
+       done
 
-${COMPDIRS} ${DESTDIRS}: setup
+${COMPDIRS}: setup
        $(RM) -f h 
        $(RM) -f sys
        $(RM) -f netinet