X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FRules;h=0d922465b4b08db21561af4002147743cba1e8c9;hb=ecd50043b5e728bbe15fefe904214de905275488;hp=cbcf51f4e8ba5abe6e7d3e49bdab4eb8fa72b96f;hpb=bf0bae5982f7a4014cf9598591fe87b1bd57e2c1;p=fs%2Flustre-release.git

diff --git a/lustre/Rules b/lustre/Rules
index cbcf51f..0d92246 100644
--- 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"