bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use kernel's modules_install target, instead of building our own. Attention: 

Module installation directories have changed!
This commit is contained in:
Florian Pose 2010-02-23 17:37:02 +01:00
parent ed4205d08a
commit 6e06798fb2
10 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -81,11 +81,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
$(MAKE) -C master modules_install $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
$(MAKE) -C devices modules_install INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
if ENABLE_TTY
$(MAKE) -C tty modules_install
endif
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

22
configure.ac
View File

@ -96,10 +96,24 @@ fi
linuxversion=`echo $kernelrelease | grep -oE "^[[0-9]]+\.[[0-9]]+\.[[0-9]]+"` linuxversion=`echo $kernelrelease | grep -oE "^[[0-9]]+\.[[0-9]]+\.[[0-9]]+"`
AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir]) AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir])
AC_SUBST(LINUX_KERNEL_RELEASE,[$kernelrelease]) AC_MSG_RESULT([$LINUX_SOURCE_DIR (Kernel $kernelrelease)])
AC_SUBST(LINUX_KERNEL_VERSION,[$linuxversion])
AC_SUBST(LINUX_MOD_PATH,[/lib/modules/$kernelrelease/ethercat]) #------------------------------------------------------------------------------
AC_MSG_RESULT([$LINUX_SOURCE_DIR (Kernel $LINUX_KERNEL_RELEASE)]) # Linux module installation subdirectory
#------------------------------------------------------------------------------
AC_ARG_WITH([module-dir],
AC_HELP_STRING(
[--with-module-dir=<DIR>],
[Linux module installation dir. Default: ethercat]
),
[moddir=[$withval]],
[moddir="ethercat"]
)
AC_SUBST(INSTALL_MOD_DIR,[$moddir])
AC_MSG_CHECKING([Linux modules installation directory])
AC_MSG_RESULT([$INSTALL_MOD_DIR])
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Generic Ethernet driver # Generic Ethernet driver

18
devices/Makefile.am
View File

@ -92,22 +92,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
if ENABLE_GENERIC INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
cp $(srcdir)/ec_generic.ko $(DESTDIR)$(LINUX_MOD_PATH)
endif
if ENABLE_8139TOO
cp $(srcdir)/ec_8139too.ko $(DESTDIR)$(LINUX_MOD_PATH)
endif
if ENABLE_E100
cp $(srcdir)/ec_e100.ko $(DESTDIR)$(LINUX_MOD_PATH)
endif
if ENABLE_E1000
$(MAKE) -C e1000 modules_install
endif
if ENABLE_R8169
cp $(srcdir)/ec_r8169.ko $(DESTDIR)$(LINUX_MOD_PATH)
endif
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

6
devices/e1000/Makefile.am
View File

@ -122,10 +122,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
if ENABLE_E1000 INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
cp $(srcdir)/ec_e1000.ko $(DESTDIR)$(LINUX_MOD_PATH)
endif
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

4
examples/dc_rtai/Makefile.am
View File

@ -40,8 +40,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
cp $(srcdir)/ec_dc_rtai_sample.ko $(DESTDIR)$(LINUX_MOD_PATH) INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

4
examples/mini/Makefile.am
View File

@ -42,8 +42,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
cp $(srcdir)/ec_mini.ko $(DESTDIR)$(LINUX_MOD_PATH) INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

4
examples/rtai/Makefile.am
View File

@ -40,8 +40,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
cp $(srcdir)/ec_rtai_sample.ko $(DESTDIR)$(LINUX_MOD_PATH) INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

4
examples/tty/Makefile.am
View File

@ -46,8 +46,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
cp $(srcdir)/ec_tty_example.ko $(DESTDIR)$(LINUX_MOD_PATH) INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

4
master/Makefile.am
View File

@ -76,8 +76,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
cp $(srcdir)/ec_master.ko $(DESTDIR)$(LINUX_MOD_PATH) INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean

4
tty/Makefile.am
View File

@ -42,8 +42,8 @@ modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
modules_install: modules_install:
mkdir -p $(DESTDIR)$(LINUX_MOD_PATH) $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
cp $(srcdir)/ec_tty.ko $(DESTDIR)$(LINUX_MOD_PATH) INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)" modules_install
clean-local: clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean