diff --git a/Makefile.am b/Makefile.am
index 88e08d73614d201327a389338b56e8258269e1b4..a1b51cbc502af663df7b49922f4f11e8a0e7f6d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,35 +35,33 @@
#
#------------------------------------------------------------------------------
-SUBDIRS = master/ devices/ script/
-
-include_HEADERS = include/ecdb.h include/ecrt.h
+SUBDIRS = master/ devices/ script/ include/
MINI_FILES = \
- examples/mini/Kbuild \
- examples/mini/Makefile.am \
- examples/mini/Makefile.in \
- examples/mini/mini.c
+ examples/mini/Kbuild \
+ examples/mini/Makefile.am \
+ examples/mini/Makefile.in \
+ examples/mini/mini.c
RTAI_FILES = \
- examples/rtai/Kbuild \
- examples/rtai/Makefile.am \
- examples/rtai/Makefile.in \
- examples/rtai/rtai_sample.c
+ examples/rtai/Kbuild \
+ examples/rtai/Makefile.am \
+ examples/rtai/Makefile.in \
+ examples/rtai/rtai_sample.c
MSR_FILES = \
- examples/msr/Kbuild \
- examples/msr/libm.o_shipped \
- examples/msr/Makefile.am \
- examples/msr/Makefile.in \
- examples/msr/msr_load \
- examples/msr/msr_param.h \
- examples/msr/msr_sample.c \
- examples/msr/msrserv.pl \
- examples/msr/msr_unload
+ examples/msr/Kbuild \
+ examples/msr/libm.o_shipped \
+ examples/msr/Makefile.am \
+ examples/msr/Makefile.in \
+ examples/msr/msr_load \
+ examples/msr/msr_param.h \
+ examples/msr/msr_sample.c \
+ examples/msr/msrserv.pl \
+ examples/msr/msr_unload
EXTRA_DIST = documentation/ethercat_doc.pdf \
- $(MINI_FILES) $(RTAI_FILES) $(MSR_FILES)
+ $(MINI_FILES) $(RTAI_FILES) $(MSR_FILES)
mydist:
@SVNREV=`svnversion $(srcdir)` && \
diff --git a/bootstrap b/bootstrap
index e4240a087e21da4c6083253bc75a6f281e2f3e54..56423768535a768ea3b7ab2f01ae00df384eb07d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
#!/bin/bash
set -x
-aclocal -I config
-autoheader
+mkdir -p autoconf
+aclocal -I autoconf
automake --add-missing
autoconf
diff --git a/configure.ac b/configure.ac
index 36f8aa5c0d10160859bf68233270726130d6c9ba..6126815a65c34fba82afc42f83687f58a7d0aaa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,9 @@
#------------------------------------------------------------------------------
AC_INIT([ethercat],[1.1],[fp@igh-essen.com])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2])
+AC_CONFIG_AUX_DIR([autoconf])
AC_PREFIX_DEFAULT([/opt/etherlab])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2])
#------------------------------------------------------------------------------
# Linux sources
@@ -54,9 +55,10 @@ AC_CONFIG_FILES([
master/Makefile
devices/Makefile
script/Makefile
+ include/Makefile
examples/mini/Makefile
- examples/rtai/Makefile
- examples/msr/Makefile
+ examples/rtai/Makefile
+ examples/msr/Makefile
])
AC_OUTPUT
diff --git a/devices/Makefile.am b/devices/Makefile.am
index dc0279cc41d4c374815c6fba8cddbfe3cf604b0b..7f3f8de312d1bf8e16917d5a4f05caf946910b66 100644
--- a/devices/Makefile.am
+++ b/devices/Makefile.am
@@ -41,16 +41,14 @@ EXTRA_DIST = \
8139too.c \
original_8139too.c
-ABSSRCDIR = `cd $(srcdir) && pwd -P`
-
all:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" modules
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
clean-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" clean
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
diff --git a/examples/mini/Makefile.am b/examples/mini/Makefile.am
index f681d1d60f0e2fe2af8c15e355a7685829b04b03..580b666d4edd4addcc3a8d8f3648e819c5aa0bab 100644
--- a/examples/mini/Makefile.am
+++ b/examples/mini/Makefile.am
@@ -35,16 +35,14 @@
#
#------------------------------------------------------------------------------
-ABSSRCDIR = `cd $(srcdir) && pwd -P`
-
all:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" modules
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
clean-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" clean
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
diff --git a/examples/msr/Makefile.am b/examples/msr/Makefile.am
index 793904b491b8910f0985e425d2b203793221372b..580b666d4edd4addcc3a8d8f3648e819c5aa0bab 100644
--- a/examples/msr/Makefile.am
+++ b/examples/msr/Makefile.am
@@ -35,23 +35,14 @@
#
#------------------------------------------------------------------------------
-EXTRA_DIST = \
- Kbuild \
- msr_sample.c msr_param.h \
- libm.o_shipped \
- msr_load msr_unload \
- msrserv.pl
-
-ABSSRCDIR = `cd $(srcdir) && pwd -P`
-
all:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" modules
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
clean-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" clean
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
diff --git a/examples/rtai/Makefile.am b/examples/rtai/Makefile.am
index aa9bd648e0b74c0a9e2d23bcbf0b1e62b39d3da1..580b666d4edd4addcc3a8d8f3648e819c5aa0bab 100644
--- a/examples/rtai/Makefile.am
+++ b/examples/rtai/Makefile.am
@@ -35,18 +35,14 @@
#
#------------------------------------------------------------------------------
-EXTRA_DIST = Kbuild rtai_sample.c
-
-ABSSRCDIR = `cd $(srcdir) && pwd -P`
-
all:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" modules
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
clean-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" clean
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..c98af2c61054b331763e7526c707d2e28d2f3cf8
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,40 @@
+#------------------------------------------------------------------------------
+#
+# Makefile.am
+#
+# IgH EtherCAT master
+#
+# $Id$
+#
+# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH
+#
+# This file is part of the IgH EtherCAT Master.
+#
+# The IgH EtherCAT Master is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# The IgH EtherCAT Master is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the IgH EtherCAT Master; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# The right to use EtherCAT Technology is granted and comes free of
+# charge under condition of compatibility of product made by
+# Licensee. People intending to distribute/sell products based on the
+# code, have to sign an agreement to guarantee that products using
+# software based on IgH EtherCAT master stay compatible with the actual
+# EtherCAT specification (which are released themselves as an open
+# standard) as the (only) precondition to have the right to use EtherCAT
+# Technology, IP and trade marks.
+#
+#------------------------------------------------------------------------------
+
+include_HEADERS = ecdb.h ecrt.h
+
+#------------------------------------------------------------------------------
diff --git a/master/Makefile.am b/master/Makefile.am
index 8983f2d2a185032f0c85b4bba553cc558206f4da..bad227aeea103099d36140cc3255a0042bb37f0a 100644
--- a/master/Makefile.am
+++ b/master/Makefile.am
@@ -51,16 +51,14 @@ EXTRA_DIST = \
slave.c slave.h \
xmldev.c xmldev.h
-ABSSRCDIR = `cd $(srcdir) && pwd -P`
-
all:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" modules
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
clean-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" clean
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
diff --git a/script/Makefile.am b/script/Makefile.am
index 8a7b9bcda6b92155fe14d2e4f7632126617df0ef..76c9ada0304421fe10a5e95a94ca30e1b638b156 100644
--- a/script/Makefile.am
+++ b/script/Makefile.am
@@ -4,7 +4,7 @@
#
# IgH EtherCAT master
#
-# $Id: Makefile.am 565 2006-09-26 13:25:09Z fp $
+# $Id$
#
# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH
#
@@ -42,6 +42,8 @@ bin_SCRIPTS = lsec
init_SCRIPTS = ethercat
sys_DATA = sysconfig
+EXTRA_DIST = lsec.pl ethercat.sh sysconfig
+
lsec: lsec.pl
cp $(srcdir)/lsec.pl lsec