file jbd-2.4.19-pre1-jcberr.patch was initially added on branch b_devel.

[fs/lustre-release.git] / lustre / Rules

diff --git a/lustre/Rules b/lustre/Rules
index cbcf51f..0d92246 100644 (file)
--- a/lustre/Rules
+++ b/lustre/Rules
@@ -10,15 +10,24 @@
 #  name_SOURCES = my.c files.c
 #  include $(top_srcdir)/Rules
 
+if LINUX25
+
+# We still need to link each module with vermagic.o to get rid of "kernel taited" warnings.
+basename=$(shell echo $< | sed -e 's/\.c//g' | sed -e 's/-//g' | sed -e 's/\.o//g')
+AM_CPPFLAGS=-I$(top_builddir)/include -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2  -DKBUILD_MODNAME=$(MODULE) -DKBUILD_BASENAME=$(basename)
+
+else
+
+AM_CPPFLAGS=-I$(top_builddir)/include
+
+endif
+
 $(MODULE).o: $($(MODULE)_OBJECTS)
        $(LD) -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r -o $(MODULE).o $($(MODULE)_OBJECTS)
 
 tags:
        rm -f $(top_srcdir)/TAGS
        rm -f $(top_srcdir)/tags
-       find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs etags -a
-       find $(top_srcdir) -name '*.[hc]' | xargs etags -a
-       find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs ctags -a
-       find $(top_srcdir) -name '*.[hc]' | xargs ctags -a
+       find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs etags -a
+       find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs ctags -a
 
-AM_CPPFLAGS="-I$(top_builddir)/include"