From c3015aef1eb67bc847084649fb0c176203502cda Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Thu, 7 May 2009 08:44:00 +0000
Subject: [PATCH] Symbol versions; Makefile improvements.

---
 devices/Kbuild.in          | 4 ++++
 devices/Makefile.am        | 2 +-
 devices/e1000/Kbuild.in    | 4 ++++
 devices/e1000/Makefile.am  | 2 +-
 examples/dc_rtai/Kbuild.in | 4 ++++
 examples/mini/Kbuild.in    | 4 ++++
 examples/rtai/Kbuild.in    | 4 ++++
 master/Makefile.am         | 2 +-
 8 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/devices/Kbuild.in b/devices/Kbuild.in
index be7dac33..4832b7d1 100644
--- a/devices/Kbuild.in
+++ b/devices/Kbuild.in
@@ -62,4 +62,8 @@ ifeq (@ENABLE_R8169@,1)
 	CFLAGS_$(EC_R8169_OBJ) = -DSVNREV=$(REV)
 endif
 
+KBUILD_EXTRA_SYMBOLS := \
+	@abs_top_builddir@/Module.symvers \
+	@abs_top_builddir@/master/Module.symvers
+
 #------------------------------------------------------------------------------
diff --git a/devices/Makefile.am b/devices/Makefile.am
index 018140cc..a828364e 100644
--- a/devices/Makefile.am
+++ b/devices/Makefile.am
@@ -70,7 +70,7 @@ BUILT_SOURCES = \
 	Kbuild
 
 modules:
-	$(MAKE) -C "@abs_top_srcdir@" modules
+	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
 
 modules_install:
 	mkdir -p $(DESTDIR)$(LINUX_MOD_PATH)
diff --git a/devices/e1000/Kbuild.in b/devices/e1000/Kbuild.in
index 9c5b219d..bbf56dde 100644
--- a/devices/e1000/Kbuild.in
+++ b/devices/e1000/Kbuild.in
@@ -50,4 +50,8 @@ ifeq (@ENABLE_E1000@,1)
 	CFLAGS_e1000_main-@KERNEL_E1000@-ethercat.o = -DSVNREV=$(REV)
 endif
 
+KBUILD_EXTRA_SYMBOLS := \
+	@abs_top_builddir@/Module.symvers \
+	@abs_top_builddir@/master/Module.symvers
+
 #------------------------------------------------------------------------------
diff --git a/devices/e1000/Makefile.am b/devices/e1000/Makefile.am
index 817295ec..596d38a0 100644
--- a/devices/e1000/Makefile.am
+++ b/devices/e1000/Makefile.am
@@ -119,7 +119,7 @@ BUILT_SOURCES = \
 	Kbuild
 
 modules:
-	$(MAKE) -C "@abs_top_srcdir@" modules
+	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
 
 modules_install:
 	mkdir -p $(DESTDIR)$(LINUX_MOD_PATH)
diff --git a/examples/dc_rtai/Kbuild.in b/examples/dc_rtai/Kbuild.in
index 7d0e57b4..b7c118a9 100644
--- a/examples/dc_rtai/Kbuild.in
+++ b/examples/dc_rtai/Kbuild.in
@@ -37,4 +37,8 @@ ec_dc_rtai_sample-objs := dc_rtai_sample.o
 
 EXTRA_CFLAGS := -I@RTAI_DIR@/include
 
+KBUILD_EXTRA_SYMBOLS := \
+	@abs_top_builddir@/Module.symvers \
+	@abs_top_builddir@/master/Module.symvers
+
 #------------------------------------------------------------------------------
diff --git a/examples/mini/Kbuild.in b/examples/mini/Kbuild.in
index 63efaa1e..157b5b1e 100644
--- a/examples/mini/Kbuild.in
+++ b/examples/mini/Kbuild.in
@@ -35,4 +35,8 @@ obj-m := ec_mini.o
 
 ec_mini-objs := mini.o
 
+KBUILD_EXTRA_SYMBOLS := \
+	@abs_top_builddir@/Module.symvers \
+	@abs_top_builddir@/master/Module.symvers
+
 #------------------------------------------------------------------------------
diff --git a/examples/rtai/Kbuild.in b/examples/rtai/Kbuild.in
index 48c621d1..4d263100 100644
--- a/examples/rtai/Kbuild.in
+++ b/examples/rtai/Kbuild.in
@@ -37,4 +37,8 @@ ec_rtai_sample-objs := rtai_sample.o
 
 EXTRA_CFLAGS := -I@RTAI_DIR@/include
 
+KBUILD_EXTRA_SYMBOLS := \
+	@abs_top_builddir@/Module.symvers \
+	@abs_top_builddir@/master/Module.symvers
+
 #------------------------------------------------------------------------------
diff --git a/master/Makefile.am b/master/Makefile.am
index a5f499aa..5fe082bb 100644
--- a/master/Makefile.am
+++ b/master/Makefile.am
@@ -72,7 +72,7 @@ BUILT_SOURCES = \
 	Kbuild
 
 modules:
-	$(MAKE) -C "@abs_top_srcdir@" modules
+	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
 
 modules_install:
 	mkdir -p $(DESTDIR)$(LINUX_MOD_PATH)
-- 
GitLab