X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux%2FKbuild.in;h=6f6f65f0498a3e0de89a2795853b4d47e6db9d87;hb=8a07709cb80462edb32fc11d056bfc08ce90f62d;hp=4e1611a31e67afbd2bd7cf81031f49abecedb4a0;hpb=22bcc0e70becd88bf895c44885d63704affe4284;p=sliver-openvswitch.git

diff --git a/datapath/linux/Kbuild.in b/datapath/linux/Kbuild.in
index 4e1611a31..6f6f65f04 100644
--- a/datapath/linux/Kbuild.in
+++ b/datapath/linux/Kbuild.in
@@ -3,19 +3,13 @@ export builddir = @abs_builddir@
 export srcdir = @abs_srcdir@
 export top_srcdir = @abs_top_srcdir@
 export VERSION = @VERSION@
-export BUILDNR = @BUILDNR@
 
 include $(srcdir)/../Modules.mk
 include $(srcdir)/Modules.mk
 
 EXTRA_CFLAGS := -DVERSION=\"$(VERSION)\"
-EXTRA_CFLAGS += -I$(srcdir)/.. 
+EXTRA_CFLAGS += -I$(srcdir)/..
 EXTRA_CFLAGS += -I$(builddir)/..
-ifeq '$(BUILDNR)' '0'
-EXTRA_CFLAGS += -DBUILDNR=\"\"
-else
-EXTRA_CFLAGS += -DBUILDNR=\"+build$(BUILDNR)\"
-endif
 EXTRA_CFLAGS += -g
 EXTRA_CFLAGS += -include $(builddir)/kcompat.h
 
@@ -24,10 +18,10 @@ EXTRA_CFLAGS += -include $(builddir)/kcompat.h
 # right place, even though it's conceptually incorrect.
 NOSTDINC_FLAGS += -I$(top_srcdir)/include -I$(srcdir)/compat -I$(srcdir)/compat/include
 
-obj-m := $(patsubst %,%_mod.o,$(build_modules))
+obj-m := $(patsubst %,%.o,$(build_modules))
 
 define module_template
-$(1)_mod-y = $$(notdir $$(patsubst %.c,%.o,$($(1)_sources)))
+$(1)-y = $$(notdir $$(patsubst %.c,%.o,$($(1)_sources)))
 endef
 
 $(foreach module,$(build_modules),$(eval $(call module_template,$(module))))