Skip to content
Snippets Groups Projects
Commit 8c71439b authored by Florian Pose's avatar Florian Pose
Browse files

Added Kbuild files to BUILT_SOURCES in Makefile.am files to create dependencies.

parent a83b03dd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 64 deletions
Makefile.am
+ 3
− 0
View file @ 8c71439b
...@@ -53,6 +53,9 @@ EXTRA_DIST = \ ...@@ -53,6 +53,9 @@ EXTRA_DIST = \
Kbuild.in \ Kbuild.in \
README.EoE README.EoE
BUILT_SOURCES = \
Kbuild
modules: modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
......
devices/Kbuild.in
+ 1
− 1
View file @ 8c71439b
...@@ -61,7 +61,7 @@ ifeq (@ENABLE_FORCEDETH@,1) ...@@ -61,7 +61,7 @@ ifeq (@ENABLE_FORCEDETH@,1)
endif endif
ifeq (@ENABLE_E1000@,1) ifeq (@ENABLE_E1000@,1)
obj-m += e1000/ obj-m += e1000/
endif endif
ifeq (@ENABLE_R8169@,1) ifeq (@ENABLE_R8169@,1)
......
devices/Makefile.am
+ 3
− 0
View file @ 8c71439b
...@@ -59,6 +59,9 @@ EXTRA_DIST = \ ...@@ -59,6 +59,9 @@ EXTRA_DIST = \
forcedeth-2.6.19-ethercat.c \ forcedeth-2.6.19-ethercat.c \
forcedeth-2.6.19-orig.c forcedeth-2.6.19-orig.c
BUILT_SOURCES = \
Kbuild
modules: modules:
$(MAKE) -C "@abs_top_srcdir@" modules $(MAKE) -C "@abs_top_srcdir@" modules
......
devices/e1000/Kbuild.in
+ 5
− 4
View file @ 8c71439b
...@@ -42,10 +42,11 @@ REV := $(shell if test -s $(TOPDIR)/svnrevision; then \ ...@@ -42,10 +42,11 @@ REV := $(shell if test -s $(TOPDIR)/svnrevision; then \
fi) fi)
ifeq (@ENABLE_E1000@,1) ifeq (@ENABLE_E1000@,1)
EC_E1000_OBJ := e1000_main-@KERNEL_E1000@-ethercat.o \ EC_E1000_OBJ := \
e1000_hw-@KERNEL_E1000@-ethercat.o \ e1000_main-@KERNEL_E1000@-ethercat.o \
e1000_ethtool-@KERNEL_E1000@-ethercat.o \ e1000_hw-@KERNEL_E1000@-ethercat.o \
e1000_param-@KERNEL_E1000@-ethercat.o e1000_ethtool-@KERNEL_E1000@-ethercat.o \
e1000_param-@KERNEL_E1000@-ethercat.o
obj-m += ec_e1000.o obj-m += ec_e1000.o
ec_e1000-objs := $(EC_E1000_OBJ) ec_e1000-objs := $(EC_E1000_OBJ)
CFLAGS_e1000_main-@KERNEL_E1000@-ethercat.o = -DSVNREV=$(REV) CFLAGS_e1000_main-@KERNEL_E1000@-ethercat.o = -DSVNREV=$(REV)
......
devices/e1000/Makefile.am
+ 3
− 0
View file @ 8c71439b
...@@ -105,6 +105,9 @@ EXTRA_DIST = \ ...@@ -105,6 +105,9 @@ EXTRA_DIST = \
e1000_param-2.6.24-ethercat.c \ e1000_param-2.6.24-ethercat.c \
e1000_param-2.6.24-orig.c e1000_param-2.6.24-orig.c
BUILT_SOURCES = \
Kbuild
modules: modules:
$(MAKE) -C "@abs_top_srcdir@" modules $(MAKE) -C "@abs_top_srcdir@" modules
......
examples/mini/Makefile.am
+ 8
− 6
View file @ 8c71439b
...@@ -39,15 +39,17 @@ EXTRA_DIST = \ ...@@ -39,15 +39,17 @@ EXTRA_DIST = \
Kbuild.in \ Kbuild.in \
mini.c mini.c
all: BUILT_SOURCES = \
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules Kbuild
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local: modules_install modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH)
cp $(srcdir)/ec_mini.ko $(DESTDIR)$(LINUX_MOD_PATH) cp $(srcdir)/ec_mini.ko $(DESTDIR)$(LINUX_MOD_PATH)
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
examples/msr/Kbuild.in
+ 19
− 16
View file @ 8c71439b
...@@ -37,22 +37,25 @@ MODULE := ec_msr_sample ...@@ -37,22 +37,25 @@ MODULE := ec_msr_sample
obj-m := $(MODULE).o obj-m := $(MODULE).o
$(MODULE)-objs := msr_sample.o \ $(MODULE)-objs := \
rt_lib/msr-core/msr_lists.o \ msr_sample.o \
rt_lib/msr-core/msr_main.o \ rt_lib/msr-core/msr_lists.o \
rt_lib/msr-core/msr_charbuf.o \ rt_lib/msr-core/msr_main.o \
rt_lib/msr-core/msr_reg.o \ rt_lib/msr-core/msr_charbuf.o \
rt_lib/msr-core/msr_interpreter.o \ rt_lib/msr-core/msr_reg.o \
rt_lib/msr-core/msr_messages.o \ rt_lib/msr-core/msr_interpreter.o \
rt_lib/msr-core/msr_proc.o \ rt_lib/msr-core/msr_messages.o \
rt_lib/msr-core/msr_error_reg.o \ rt_lib/msr-core/msr_proc.o \
rt_lib/msr-utils/msr_utils.o \ rt_lib/msr-core/msr_error_reg.o \
rt_lib/msr-utils/msr_time.o \ rt_lib/msr-utils/msr_utils.o \
rt_lib/msr-math/msr_base64.o \ rt_lib/msr-utils/msr_time.o \
rt_lib/msr-math/msr_hex_bin.o \ rt_lib/msr-math/msr_base64.o \
libm.o rt_lib/msr-math/msr_hex_bin.o \
libm.o
EXTRA_CFLAGS := -I@MSR_DIR@/include -I@RTAI_DIR@/include \ EXTRA_CFLAGS := \
-D_SIMULATION -mhard-float -I@MSR_DIR@/include \
-I@RTAI_DIR@/include \
-D_SIMULATION -mhard-float
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
examples/msr/Makefile.am
+ 8
− 6
View file @ 8c71439b
...@@ -38,15 +38,17 @@ EXTRA_DIST = \ ...@@ -38,15 +38,17 @@ EXTRA_DIST = \
msrserv.pl \ msrserv.pl \
init.sh init.sh
all: BUILT_SOURCES = \
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules Kbuild
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local: modules_install modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH)
cp $(srcdir)/ec_msr_sample.ko $(DESTDIR)$(LINUX_MOD_PATH) cp $(srcdir)/ec_msr_sample.ko $(DESTDIR)$(LINUX_MOD_PATH)
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
examples/rtai/Makefile.am
+ 8
− 6
View file @ 8c71439b
...@@ -37,15 +37,17 @@ EXTRA_DIST = \ ...@@ -37,15 +37,17 @@ EXTRA_DIST = \
Kbuild.in \ Kbuild.in \
rtai_sample.c rtai_sample.c
all: BUILT_SOURCES = \
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules Kbuild
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local: modules_install modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH)
cp $(srcdir)/ec_rtai_sample.ko $(DESTDIR)$(LINUX_MOD_PATH) cp $(srcdir)/ec_rtai_sample.ko $(DESTDIR)$(LINUX_MOD_PATH)
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
master/Kbuild.in
+ 25
− 25
View file @ 8c71439b
...@@ -37,31 +37,31 @@ obj-m := ec_master.o ...@@ -37,31 +37,31 @@ obj-m := ec_master.o
ec_master-objs := \ ec_master-objs := \
cdev.o \ cdev.o \
datagram.o \ datagram.o \
device.o \ device.o \
domain.o \ domain.o \
fmmu_config.o \ fmmu_config.o \
fsm_change.o \ fsm_change.o \
fsm_coe.o \ fsm_coe.o \
fsm_coe_map.o \ fsm_coe_map.o \
fsm_master.o \ fsm_master.o \
fsm_pdo_assign.o \ fsm_pdo_assign.o \
fsm_pdo_mapping.o \ fsm_pdo_mapping.o \
fsm_sii.o \ fsm_sii.o \
fsm_slave_config.o \ fsm_slave_config.o \
fsm_slave_scan.o \ fsm_slave_scan.o \
mailbox.o \ mailbox.o \
master.o \ master.o \
module.o \ module.o \
pdo.o \ pdo.o \
pdo_entry.o \ pdo_entry.o \
pdo_list.o \ pdo_list.o \
sdo.o \ sdo.o \
sdo_entry.o \ sdo_entry.o \
sdo_request.o \ sdo_request.o \
slave.o \ slave.o \
slave_config.o \ slave_config.o \
sync.o \ sync.o \
sync_config.o sync_config.o
ifeq (@ENABLE_EOE@,1) ifeq (@ENABLE_EOE@,1)
......
master/Makefile.am
+ 3
− 0
View file @ 8c71439b
...@@ -66,6 +66,9 @@ EXTRA_DIST = \ ...@@ -66,6 +66,9 @@ EXTRA_DIST = \
sync.c sync.h \ sync.c sync.h \
sync_config.c sync_config.h sync_config.c sync_config.h
BUILT_SOURCES = \
Kbuild
modules: modules:
$(MAKE) -C "@abs_top_srcdir@" modules $(MAKE) -C "@abs_top_srcdir@" modules
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment