Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-05 19:39:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-m4-Makefile' into 'stable-1.5'

Browse Source 
Remove empty m4/Makefile.am

See merge request etherlab.org/ethercat!17
This commit is contained in:
Florian Pose
2021-06-07 12:56:48 +00:00
parent 72d7469857 d23b8ae258
commit bd0612d6aa
3 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap
View File

@@ -33,6 +33,10 @@ set -x
touch ChangeLog touch ChangeLog
# Older versions of aclocal refused to work without `m4` folder:
# https://lists.gnu.org/archive/html/automake-patches/2010-02/msg00030.html
mkdir -p m4
autoreconf -i autoreconf -i
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------

1
configure.ac
View File

@@ -1144,7 +1144,6 @@ AC_CONFIG_FILES([
include/Makefile include/Makefile
lib/Makefile lib/Makefile
lib/libethercat.pc lib/libethercat.pc
m4/Makefile
master/Kbuild master/Kbuild
master/Makefile master/Makefile
script/Makefile script/Makefile

32
m4/Makefile.am
View File

@@ -1,32 +0,0 @@
#------------------------------------------------------------------------------
#
# $Id$
#
# Copyright (C) 2006-2008 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 version 2, as
# published by the Free Software Foundation.
#
# 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 license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
#
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------