# HG changeset patch # User Florian Pose # Date 1224583099 0 # Node ID 88e573e033f11f5e704a44c93c5164617cc7d323 # Parent f16b38b8b696c1b0dbcdfeccdc3f62d48bbeed53 Build examples by default. diff -r f16b38b8b696 -r 88e573e033f1 Kbuild.in --- a/Kbuild.in Tue Oct 21 09:33:00 2008 +0000 +++ b/Kbuild.in Tue Oct 21 09:58:19 2008 +0000 @@ -31,6 +31,6 @@ # #------------------------------------------------------------------------------ -obj-m := master/ devices/ +obj-m := examples/ master/ devices/ #------------------------------------------------------------------------------ diff -r f16b38b8b696 -r 88e573e033f1 Makefile.am --- a/Makefile.am Tue Oct 21 09:33:00 2008 +0000 +++ b/Makefile.am Tue Oct 21 09:58:19 2008 +0000 @@ -45,6 +45,9 @@ SUBDIRS += lib endif +# userspace example depends on lib/ +SUBDIRS += examples + DIST_SUBDIRS = \ devices \ examples \ diff -r f16b38b8b696 -r 88e573e033f1 configure.ac --- a/configure.ac Tue Oct 21 09:33:00 2008 +0000 +++ b/configure.ac Tue Oct 21 09:58:19 2008 +0000 @@ -423,6 +423,7 @@ devices/Makefile devices/e1000/Kbuild devices/e1000/Makefile + examples/Kbuild examples/Makefile examples/mini/Kbuild examples/mini/Makefile diff -r f16b38b8b696 -r 88e573e033f1 devices/Makefile.am --- a/devices/Makefile.am Tue Oct 21 09:33:00 2008 +0000 +++ b/devices/Makefile.am Tue Oct 21 09:58:19 2008 +0000 @@ -35,6 +35,7 @@ DIST_SUBDIRS = e1000 +# using HEADERS to enable tags target noinst_HEADERS = \ 8139too-2.6.13-ethercat.c \ 8139too-2.6.13-orig.c \ @@ -50,7 +51,6 @@ 8139too-2.6.23-orig.c \ 8139too-2.6.24-ethercat.c \ 8139too-2.6.24-orig.c \ - Kbuild.in \ e100-2.6.20-ethercat.c \ e100-2.6.20-orig.c \ e100-2.6.24-ethercat.c \ @@ -59,6 +59,9 @@ e100-2.6.26-orig.c \ ecdev.h +EXTRA_DIST = \ + Kbuild.in + BUILT_SOURCES = \ Kbuild diff -r f16b38b8b696 -r 88e573e033f1 examples/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/Kbuild.in Tue Oct 21 09:58:19 2008 +0000 @@ -0,0 +1,36 @@ +#------------------------------------------------------------------------------ +# +# $Id: Kbuild.in 1097 2008-04-03 15:31:34Z fp $ +# +# 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. +# +#------------------------------------------------------------------------------ + +obj-m := mini/ + +#------------------------------------------------------------------------------ diff -r f16b38b8b696 -r 88e573e033f1 examples/Makefile.am --- a/examples/Makefile.am Tue Oct 21 09:33:00 2008 +0000 +++ b/examples/Makefile.am Tue Oct 21 09:58:19 2008 +0000 @@ -31,9 +31,19 @@ # #------------------------------------------------------------------------------ +if ENABLE_USERLIB +SUBDIRS = user +endif + DIST_SUBDIRS = \ mini \ rtai \ user +EXTRA_DIST = \ + Kbuild.in + +BUILT_SOURCES = \ + Kbuild + #------------------------------------------------------------------------------ diff -r f16b38b8b696 -r 88e573e033f1 master/Makefile.am --- a/master/Makefile.am Tue Oct 21 09:33:00 2008 +0000 +++ b/master/Makefile.am Tue Oct 21 09:58:19 2008 +0000 @@ -31,9 +31,8 @@ # #------------------------------------------------------------------------------ -# HEADERS, because of tags target +# using HEADERS to enable tags target noinst_HEADERS = \ - Kbuild.in \ cdev.c cdev.h \ datagram.c datagram.h \ debug.c debug.h \ @@ -67,6 +66,9 @@ sync_config.c sync_config.h \ voe_handler.c voe_handler.h +EXTRA_DIST = \ + Kbuild.in + BUILT_SOURCES = \ Kbuild