Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-08-18 09:07:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved installation, added quick modules_install target.

Browse Source
This commit is contained in:
Florian Pose
2006-11-03 14:18:05 +00:00
parent 9f6d10e2b8
commit f9f2b40b65
7 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+4
View File
@@ -43,6 +43,10 @@ EXTRA_DIST = \
globals.h \
LICENSE
modules_install:
$(MAKE) -C master modules_install
$(MAKE) -C devices modules_install
mydist:
@SVNREV=`svnversion $(srcdir)` && \
$(MAKE) dist-bzip2 \
configure.ac
+23 -4
View File
@@ -36,7 +36,7 @@ AC_ARG_WITH([linux-dir],
modulesdir=/lib/modules/${version}
if test \! -d ${modulesdir} || test \! -d ${modulesdir}/build; then
echo
AC_MSG_ERROR([Invalid modules directory ${modulesdir}])
AC_MSG_ERROR([Failed to find Linux sources. Use --with-linux-dir!])
fi
sourcedir=`cd ${modulesdir}/build && pwd -P`
]
@@ -45,12 +45,31 @@ AC_ARG_WITH([linux-dir],
AC_MSG_CHECKING([for Linux kernel sources])
if test \! -r ${sourcedir}/.config; then
echo
AC_MSG_ERROR([No configured Linux kernel sources in $sourcedir])
echo
AC_MSG_ERROR([No configured Linux kernel sources in $sourcedir])
fi
# Try to get kernel release string
if test -r ${sourcedir}/.kernelrelease; then
kernelrelease=`cat $sourcedir/.kernelrelease`
elif test -r ${sourcedir}/include/linux/version.h; then
hdr=$sourcedir/include/linux/version.h
kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"`
fi
if test -z "$kernelrelease"; then
echo
AC_MSG_ERROR([Failed to extract Linux kernel version!])
fi
# Extract three numbers from kernel release string
linuxversion=`echo $kernelrelease | grep -oE [[0-9]]+\.[[0-9]]+\.[[0-9]]+`
AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir])
AC_MSG_RESULT($LINUX_SOURCE_DIR)
AC_SUBST(LINUX_KERNEL_RELEASE,[$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)])
#------------------------------------------------------------------------------
# Debug interface
devices/Makefile.am
+4 -4
View File
@@ -45,9 +45,9 @@ all-local:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
install-data-local: modules_install
modules_install:
cp $(srcdir)/ec_8139too.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
examples/mini/Makefile.am
+4 -4
View File
@@ -43,9 +43,9 @@ all:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
install-data-local: modules_install
modules_install:
cp $(srcdir)/ec_mini.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
examples/msr/Makefile.am
+4 -4
View File
@@ -44,9 +44,9 @@ all:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
install-data-local: modules_install
modules_install:
cp $(srcdir)/ec_msr_sample.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
examples/rtai/Makefile.am
+4 -4
View File
@@ -43,9 +43,9 @@ all:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
install-data-local: modules_install
modules_install:
cp $(srcdir)/ec_rtai_sample.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
master/Makefile.am
+4 -4
View File
@@ -58,9 +58,9 @@ all-local:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
install-data-local: modules_install
modules_install:
cp $(srcdir)/ec_master.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------