X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2FRules.in;h=293ff3cd65e3958988e769c26e014db90b4f3542;hp=218094043757812e3027300e27146f6d5c01b79e;hb=51920e8369b540fef35e0a1a029fee1fd548e8ac;hpb=3de901fceee79de12a31428bcc6ba3a00f10d1fe

diff --git a/lustre/Rules.in b/lustre/Rules.in
index 2180940..293ff3c 100644
--- a/lustre/Rules.in
+++ b/lustre/Rules.in
@@ -19,25 +19,17 @@
 # DIST_SOURCES = $(<module-name>-objs:.o=.c) <other sources>
 # MOSTLYCLEANFILES = *.o *.ko *.mod.c
 
-ifeq ($(KERNELRELEASE),)
+ifeq ($(PATCHLEVEL),)
 
 include autoMakefile
 
-ifeq (@MODULES_TRUE@,)
-$(foreach MODULE,$(MODULES),$(MODULE)@KMODEXT@): FORCE
-	$(MAKE) @ARCH_UM@ -C $(LINUX) SUBDIRS=$(PWD) modules
-FORCE:
-endif
-
 else
 
-# we want to use -O0 for UML, unless it's already set (ie, in the
-# socknal where we need to build with -O2 so that htonl etc. are
-# linked correctly
-ifeq ($(filter -O%,$(EXTRA_CFLAGS)),)
-EXTRA_CFLAGS += @UML_CFLAGS@
-endif
-EXTRA_CFLAGS += @EXTRA_KCFLAGS@
+include @LINUX_CONFIG@
+
+EXTRA_CFLAGS := $(EXTRA_PRE_CFLAGS)
+EXTRA_CFLAGS += @EXTRA_KCFLAGS@ @UML_CFLAGS@
+EXTRA_CFLAGS += $(EXTRA_POST_CFLAGS)
 
 obj-m := $(patsubst %,%.o,$(MODULES))
 
@@ -47,6 +39,8 @@ O_TARGET := $(firstword $(obj-m))
 obj-y := $($(firstword $(MODULES))-objs)
 export-objs := $(obj-y) $(filter-out $(O_TARGET),$(obj-m))
 include $(TOPDIR)/Rules.make
+$(MODINCL)/%.ver: %.c
+	@true
 endif # PATCHLEVEL
 
 endif # KERNELRELEASE