# HG changeset patch # User Florian Pose # Date 1160405000 0 # Node ID e6e708a5d502c9b5e451f51936fcb351262aaaf2 # Parent 7020a47f092a94f86e534fd392cfdfdb92ae5697 Improved autotools files. diff -r 7020a47f092a -r e6e708a5d502 Makefile.am --- a/Makefile.am Mon Oct 09 13:14:07 2006 +0000 +++ b/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -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 -r 7020a47f092a -r e6e708a5d502 bootstrap --- a/bootstrap Mon Oct 09 13:14:07 2006 +0000 +++ b/bootstrap Mon Oct 09 14:43:20 2006 +0000 @@ -1,7 +1,7 @@ #!/bin/bash set -x -aclocal -I config -autoheader +mkdir -p autoconf +aclocal -I autoconf automake --add-missing autoconf diff -r 7020a47f092a -r e6e708a5d502 configure.ac --- a/configure.ac Mon Oct 09 13:14:07 2006 +0000 +++ b/configure.ac Mon Oct 09 14:43:20 2006 +0000 @@ -3,8 +3,9 @@ #------------------------------------------------------------------------------ AC_INIT([ethercat],[1.1],[fp@igh-essen.com]) +AC_CONFIG_AUX_DIR([autoconf]) +AC_PREFIX_DEFAULT([/opt/etherlab]) AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2]) -AC_PREFIX_DEFAULT([/opt/etherlab]) #------------------------------------------------------------------------------ # Linux sources @@ -54,9 +55,10 @@ 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 -r 7020a47f092a -r e6e708a5d502 devices/Makefile.am --- a/devices/Makefile.am Mon Oct 09 13:14:07 2006 +0000 +++ b/devices/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -41,16 +41,14 @@ 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 -r 7020a47f092a -r e6e708a5d502 examples/mini/Makefile.am --- a/examples/mini/Makefile.am Mon Oct 09 13:14:07 2006 +0000 +++ b/examples/mini/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -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 -r 7020a47f092a -r e6e708a5d502 examples/msr/Makefile.am --- a/examples/msr/Makefile.am Mon Oct 09 13:14:07 2006 +0000 +++ b/examples/msr/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -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 -r 7020a47f092a -r e6e708a5d502 examples/rtai/Makefile.am --- a/examples/rtai/Makefile.am Mon Oct 09 13:14:07 2006 +0000 +++ b/examples/rtai/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -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 -r 7020a47f092a -r e6e708a5d502 include/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -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 -r 7020a47f092a -r e6e708a5d502 master/Makefile.am --- a/master/Makefile.am Mon Oct 09 13:14:07 2006 +0000 +++ b/master/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -51,16 +51,14 @@ 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 -r 7020a47f092a -r e6e708a5d502 script/Makefile.am --- a/script/Makefile.am Mon Oct 09 13:14:07 2006 +0000 +++ b/script/Makefile.am Mon Oct 09 14:43:20 2006 +0000 @@ -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 @@ init_SCRIPTS = ethercat sys_DATA = sysconfig +EXTRA_DIST = lsec.pl ethercat.sh sysconfig + lsec: lsec.pl cp $(srcdir)/lsec.pl lsec