X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FRules;h=b28540a76523d5c01f39243ed9b6a494be33c44b;hb=c844b8967dee2fcc0d84372967a028616c76adcd;hp=6c9e894bfbcf61e8ea15d814d5a2e207e377cd60;hpb=b24c0c21bd9aa6416d6e557b0543b9f99a9f8098;p=fs%2Flustre-release.git

diff --git a/lustre/Rules b/lustre/Rules
index 6c9e894..b28540a 100644
--- a/lustre/Rules
+++ b/lustre/Rules
@@ -10,14 +10,29 @@
 #  name_SOURCES = my.c files.c
 #  include $(top_srcdir)/Rules
 
-$(MODULE).o: $($(MODULE)_OBJECTS)
+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) $($(MODULE)_DEPENDENCIES)
 	$(LD) -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r -o $(MODULE).o $($(MODULE)_OBJECTS)
 
 tags:
 	rm -f $(top_srcdir)/TAGS
+	ETAGSF=`etags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	find $(top_srcdir) -name '*.[hc]' | xargs etags $$ETAGSF -a
+
 	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
+	CTAGSF=`ctags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	find $(top_srcdir) -name '*.[hc]' | xargs ctags $$CTAGSF -a