From 7be3b11fcec81f18a37a9558a35db6a20ba9f8f9 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Wed, 19 Sep 2007 08:22:20 +0000 Subject: [PATCH] Removed config.kbuild and replaced Kbuild files by Kbuild.in files. --- Kbuild => Kbuild.in | 0 Makefile.am | 4 +-- NEWS | 6 ++++ configure.ac | 52 +++++++++++++++-------------- devices/{Kbuild => Kbuild.in} | 16 ++++----- devices/Makefile.am | 2 +- devices/e1000/{Kbuild => Kbuild.in} | 13 ++++---- devices/e1000/Makefile.am | 2 +- dummy/{Kbuild => Kbuild.in} | 4 +-- dummy/Makefile.am | 2 +- examples/mini/{Kbuild => Kbuild.in} | 0 examples/mini/Makefile.am | 4 ++- examples/msr/{Kbuild => Kbuild.in} | 4 +-- examples/msr/Makefile.am | 2 +- examples/rtai/{Kbuild => Kbuild.in} | 4 +-- examples/rtai/Makefile.am | 4 ++- master/{Kbuild => Kbuild.in} | 6 ++-- master/Makefile.am | 2 +- 18 files changed, 64 insertions(+), 63 deletions(-) rename Kbuild => Kbuild.in (100%) rename devices/{Kbuild => Kbuild.in} (87%) rename devices/e1000/{Kbuild => Kbuild.in} (85%) rename dummy/{Kbuild => Kbuild.in} (97%) rename examples/mini/{Kbuild => Kbuild.in} (100%) rename examples/msr/{Kbuild => Kbuild.in} (96%) rename examples/rtai/{Kbuild => Kbuild.in} (95%) rename master/{Kbuild => Kbuild.in} (96%) diff --git a/Kbuild b/Kbuild.in similarity index 100% rename from Kbuild rename to Kbuild.in diff --git a/Makefile.am b/Makefile.am index 98440f4a..1735a9dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ EXTRA_DIST = \ Doxyfile \ FEATURES \ globals.h \ - Kbuild \ + Kbuild.in \ README.EoE modules: @@ -74,13 +74,13 @@ mrproper: clean cleandoc config.h.in \ config.log \ config.status \ - config.kbuild \ configure.in \ configure \ Makefile \ Makefile.in \ stamp-h1 \ ChangeLog \ + Kbuild \ *~ doc: diff --git a/NEWS b/NEWS index 776cca26..6c33de30 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,12 @@ $Id$ ------------------------------------------------------------------------------- +Changes in version 1.3.2: + +* Removed config.kbuild and replaced Kbuild files by Kbuild.in files. + +------------------------------------------------------------------------------- + Changes in version 1.3.1: * Improved EoE handling: Avoided skipping of datagrams and release lock diff --git a/configure.ac b/configure.ac index 6415d313..0e43facb 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,7 @@ AC_ARG_ENABLE([8139too], ) AM_CONDITIONAL(ENABLE_8139TOO, test "x$enable8139too" = "x1") +AC_SUBST(ENABLE_8139TOO,[$enable8139too]) AC_ARG_WITH([8139too-kernel], AC_HELP_STRING( @@ -128,6 +129,8 @@ if test "x${enable8139too}" = "x1"; then AC_MSG_RESULT([$kernel8139too]) fi +AC_SUBST(KERNEL_8139TOO,[$kernel8139too]) + #------------------------------------------------------------------------------ # e100 driver #------------------------------------------------------------------------------ @@ -149,6 +152,7 @@ AC_ARG_ENABLE([e100], ) AM_CONDITIONAL(ENABLE_E100, test "x$enablee100" = "x1") +AC_SUBST(ENABLE_E100,[$enablee100]) AC_ARG_WITH([e100-kernel], AC_HELP_STRING( @@ -180,6 +184,8 @@ if test "x${enablee100}" = "x1"; then AC_MSG_RESULT([$kernele100]) fi +AC_SUBST(KERNEL_E100,[$kernele100]) + #------------------------------------------------------------------------------ # forcedeth driver #------------------------------------------------------------------------------ @@ -201,6 +207,7 @@ AC_ARG_ENABLE([forcedeth], ) AM_CONDITIONAL(ENABLE_FORCEDETH, test "x$enableforcedeth" = "x1") +AC_SUBST(ENABLE_FORCEDETH,[$enableforcedeth]) AC_ARG_WITH([forcedeth-kernel], AC_HELP_STRING( @@ -232,6 +239,8 @@ if test "x${enableforcedeth}" = "x1"; then AC_MSG_RESULT([$kernelforcedeth]) fi +AC_SUBST(KERNEL_FORCEDETH,[$kernelforcedeth]) + #------------------------------------------------------------------------------ # e1000 driver #------------------------------------------------------------------------------ @@ -253,6 +262,7 @@ AC_ARG_ENABLE([e1000], ) AM_CONDITIONAL(ENABLE_E1000, test "x$enablee1000" = "x1") +AC_SUBST(ENABLE_E1000,[$enablee1000]) AC_ARG_WITH([e1000-kernel], AC_HELP_STRING( @@ -284,6 +294,8 @@ if test "x${enablee1000}" = "x1"; then AC_MSG_RESULT([$kernele1000]) fi +AC_SUBST(KERNEL_E1000,[$kernele1000]) + #------------------------------------------------------------------------------ # RTAI path (optional) #------------------------------------------------------------------------------ @@ -310,9 +322,10 @@ else AC_MSG_ERROR([no RTAI installation found in ${rtaidir}!]) fi AC_MSG_RESULT([$rtaidir]) - AC_SUBST(RTAI_DIR,[$rtaidir]) fi +AC_SUBST(RTAI_DIR,[$rtaidir]) + #------------------------------------------------------------------------------ # MSR path (optional) #------------------------------------------------------------------------------ @@ -339,9 +352,10 @@ else AC_MSG_ERROR([no MSR installation found in ${msrdir}!]) fi AC_MSG_RESULT([$msrdir]) - AC_SUBST(MSR_DIR,[$msrdir]) fi +AC_SUBST(MSR_DIR,[$msrdir]) + #------------------------------------------------------------------------------ # Debug interface #------------------------------------------------------------------------------ @@ -366,6 +380,7 @@ if test "x${dbg}" = "x1"; then AC_DEFINE([EC_DEBUG_IF], [1], [Debug interfaces enabled]) fi AM_CONDITIONAL(ENABLE_DEBUG_IF, test "x$dbg" = "x1") +AC_SUBST(ENABLE_DEBUG_IF,[$dbg]) #------------------------------------------------------------------------------ # Debug ring @@ -412,6 +427,7 @@ AC_ARG_ENABLE([dummy], ) AM_CONDITIONAL(ENABLE_DUMMY, test "x$dummy" = "x1") +AC_SUBST(ENABLE_DUMMY,[$dummy]) #------------------------------------------------------------------------------ # Ethernet-over-EtherCAT support @@ -437,45 +453,31 @@ if test "x${eoe}" = "x1"; then AC_DEFINE([EC_EOE], [1], [EoE support enabled]) fi AM_CONDITIONAL(ENABLE_EOE, test "x$eoe" = "x1") - -#------------------------------------------------------------------------------ - -# Create config.kbuild - -echo configure: creating config.kbuild... - -cat > config.kbuild </dev/null || echo "unknown"; \ fi) -ifeq ($(ENABLE_8139TOO),1) - EC_8139TOO_OBJ := 8139too-$(KERNEL_8139TOO)-ethercat.o +ifeq (@ENABLE_8139TOO@,1) + EC_8139TOO_OBJ := 8139too-@KERNEL_8139TOO@-ethercat.o obj-m += ec_8139too.o ec_8139too-objs := $(EC_8139TOO_OBJ) CFLAGS_$(EC_8139TOO_OBJ) = -DSVNREV=$(REV) endif -ifeq ($(ENABLE_E100),1) - EC_E100_OBJ := e100-$(KERNEL_E100)-ethercat.o +ifeq (@ENABLE_E100@,1) + EC_E100_OBJ := e100-@KERNEL_E100@-ethercat.o obj-m += ec_e100.o ec_e100-objs := $(EC_E100_OBJ) CFLAGS_$(EC_E100_OBJ) = -DSVNREV=$(REV) endif -ifeq ($(ENABLE_FORCEDETH),1) - EC_FORCEDETH_OBJ := forcedeth-$(KERNEL_FORCEDETH)-ethercat.o +ifeq (@ENABLE_FORCEDETH@,1) + EC_FORCEDETH_OBJ := forcedeth-@KERNEL_FORCEDETH@-ethercat.o obj-m += ec_forcedeth.o ec_forcedeth-objs := $(EC_FORCEDETH_OBJ) CFLAGS_$(EC_FORCEDETH_OBJ) = -DSVNREV=$(REV) endif -ifeq ($(ENABLE_E1000),1) +ifeq (@ENABLE_E1000@,1) obj-m += e1000/ endif diff --git a/devices/Makefile.am b/devices/Makefile.am index f66c258a..6c923fa7 100644 --- a/devices/Makefile.am +++ b/devices/Makefile.am @@ -36,7 +36,7 @@ SUBDIRS = e1000 DIST_SUBDIRS = e1000 EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ ecdev.h \ 8139too-2.6.13-ethercat.c \ 8139too-2.6.13-orig.c \ diff --git a/devices/e1000/Kbuild b/devices/e1000/Kbuild.in similarity index 85% rename from devices/e1000/Kbuild rename to devices/e1000/Kbuild.in index dc741f94..e37d799c 100644 --- a/devices/e1000/Kbuild +++ b/devices/e1000/Kbuild.in @@ -32,7 +32,6 @@ #------------------------------------------------------------------------------ TOPDIR := $(src)/../.. -include $(TOPDIR)/config.kbuild REV := $(shell if test -s $(TOPDIR)/svnrevision; then \ cat $(TOPDIR)/svnrevision; \ @@ -40,14 +39,14 @@ REV := $(shell if test -s $(TOPDIR)/svnrevision; then \ svnversion $(TOPDIR) 2>/dev/null || echo "unknown"; \ fi) -ifeq ($(ENABLE_E1000),1) - EC_E1000_OBJ := e1000_main-$(KERNEL_E1000)-ethercat.o \ - e1000_hw-$(KERNEL_E1000)-ethercat.o \ - e1000_ethtool-$(KERNEL_E1000)-ethercat.o \ - e1000_param-$(KERNEL_E1000)-ethercat.o +ifeq (@ENABLE_E1000@,1) + EC_E1000_OBJ := e1000_main-@KERNEL_E1000@-ethercat.o \ + e1000_hw-@KERNEL_E1000@-ethercat.o \ + e1000_ethtool-@KERNEL_E1000@-ethercat.o \ + e1000_param-@KERNEL_E1000@-ethercat.o obj-m += ec_e1000.o ec_e1000-objs := $(EC_E1000_OBJ) - CFLAGS_e1000_main-$(KERNEL_E1000)-ethercat.o = -DSVNREV=$(REV) + CFLAGS_e1000_main-@KERNEL_E1000@-ethercat.o = -DSVNREV=$(REV) endif #------------------------------------------------------------------------------ diff --git a/devices/e1000/Makefile.am b/devices/e1000/Makefile.am index 7ae2d64e..876103b6 100644 --- a/devices/e1000/Makefile.am +++ b/devices/e1000/Makefile.am @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ e1000_ethtool-2.6.13-ethercat.c \ e1000_ethtool-2.6.13-orig.c \ e1000-2.6.13-ethercat.h \ diff --git a/dummy/Kbuild b/dummy/Kbuild.in similarity index 97% rename from dummy/Kbuild rename to dummy/Kbuild.in index 15240f1b..da05d1b7 100644 --- a/dummy/Kbuild +++ b/dummy/Kbuild.in @@ -31,15 +31,13 @@ # #------------------------------------------------------------------------------ -include $(src)/../config.kbuild - REV := $(shell if test -s $(src)/../svnrevision; then \ cat $(src)/../svnrevision; \ else \ svnversion $(src) 2>/dev/null || echo "unknown"; \ fi) -ifeq ($(ENABLE_DUMMY),1) +ifeq (@ENABLE_DUMMY@,1) obj-m := ec_dummy.o ec_dummy-objs := module.o master.o slave.o domain.o CFLAGS_dummy.o := -DSVNREV=$(REV) diff --git a/dummy/Makefile.am b/dummy/Makefile.am index e71451b0..64b15be8 100644 --- a/dummy/Makefile.am +++ b/dummy/Makefile.am @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ module.c \ master.c \ slave.c \ diff --git a/examples/mini/Kbuild b/examples/mini/Kbuild.in similarity index 100% rename from examples/mini/Kbuild rename to examples/mini/Kbuild.in diff --git a/examples/mini/Makefile.am b/examples/mini/Makefile.am index 3a6cec88..6926b4f7 100644 --- a/examples/mini/Makefile.am +++ b/examples/mini/Makefile.am @@ -35,7 +35,9 @@ # #------------------------------------------------------------------------------ -EXTRA_DIST = Kbuild mini.c +EXTRA_DIST = \ + Kbuild.in \ + mini.c all: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules diff --git a/examples/msr/Kbuild b/examples/msr/Kbuild.in similarity index 96% rename from examples/msr/Kbuild rename to examples/msr/Kbuild.in index 6aaceb56..58016d91 100644 --- a/examples/msr/Kbuild +++ b/examples/msr/Kbuild.in @@ -31,8 +31,6 @@ # #------------------------------------------------------------------------------ -include $(src)/../../config.kbuild - MODULE := ec_msr_sample obj-m := $(MODULE).o @@ -52,7 +50,7 @@ $(MODULE)-objs := msr_sample.o \ rt_lib/msr-math/msr_hex_bin.o \ libm.o -EXTRA_CFLAGS := -I$(MSR_DIR)/include -I$(RTAI_DIR)/include \ +EXTRA_CFLAGS := -I@MSR_DIR@/include -I@RTAI_DIR@/include \ -D_SIMULATION -mhard-float #------------------------------------------------------------------------------ diff --git a/examples/msr/Makefile.am b/examples/msr/Makefile.am index 2364dede..3cb164e6 100644 --- a/examples/msr/Makefile.am +++ b/examples/msr/Makefile.am @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ libm.o_shipped \ msr_sample.c \ msrserv.pl \ diff --git a/examples/rtai/Kbuild b/examples/rtai/Kbuild.in similarity index 95% rename from examples/rtai/Kbuild rename to examples/rtai/Kbuild.in index a24f6745..7c7099a4 100644 --- a/examples/rtai/Kbuild +++ b/examples/rtai/Kbuild.in @@ -31,12 +31,10 @@ # #------------------------------------------------------------------------------ -include $(src)/../../config.kbuild - obj-m := ec_rtai_sample.o ec_rtai_sample-objs := rtai_sample.o -EXTRA_CFLAGS := -I$(RTAI_DIR)/include +EXTRA_CFLAGS := -I@RTAI_DIR@/include #------------------------------------------------------------------------------ diff --git a/examples/rtai/Makefile.am b/examples/rtai/Makefile.am index ad1c89b7..730d0780 100644 --- a/examples/rtai/Makefile.am +++ b/examples/rtai/Makefile.am @@ -33,7 +33,9 @@ # #------------------------------------------------------------------------------ -EXTRA_DIST = Kbuild rtai_sample.c +EXTRA_DIST = \ + Kbuild.in \ + rtai_sample.c all: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules diff --git a/master/Kbuild b/master/Kbuild.in similarity index 96% rename from master/Kbuild rename to master/Kbuild.in index 93aa0d75..13b8f360 100644 --- a/master/Kbuild +++ b/master/Kbuild.in @@ -31,18 +31,16 @@ # #------------------------------------------------------------------------------ -include $(src)/../config.kbuild - obj-m := ec_master.o ec_master-objs := module.o master.o device.o pdo.o sync.o fmmu.o slave.o \ datagram.o domain.o mailbox.o canopen.o fsm_sii.o fsm_change.o \ fsm_coe.o fsm_mapping.o fsm_slave.o fsm_master.o xmldev.o -ifeq ($(ENABLE_EOE),1) +ifeq (@ENABLE_EOE@,1) ec_master-objs += ethernet.o endif -ifeq ($(ENABLE_DEBUG_IF),1) +ifeq (@ENABLE_DEBUG_IF@,1) ec_master-objs += debug.o endif diff --git a/master/Makefile.am b/master/Makefile.am index 8eece623..ad3280fb 100644 --- a/master/Makefile.am +++ b/master/Makefile.am @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ canopen.c canopen.h \ datagram.c datagram.h \ debug.c debug.h \