Automake options: add subdir-objects, and clean up
PATCH 1/2 Automake options: add subdir-objects, and clean up
--- Makefile.am | 1 - configure.ac | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
Makefile.am +0 -1
@@ -25,7 +25,6 @@ # This option prevents autoreconf from overriding our COPYING and # INSTALL targets: -AUTOMAKE_OPTIONS = foreign 1.9 ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = \
configure.ac +1 -1
@@ -54,7 +54,7 @@ m4_define([serial_tests], [ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' ]) ]) -AM_INIT_AUTOMAKE(foreign serial_tests) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(foreign serial_tests subdir-objects 1.9) dnl NB: Do not [quote] this parameter. AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS
--
2.25.4
Quoted 17 lines · Matthias Andree
Makefile.am +0
-1@@ -25,7 +25,6 @@ # This option prevents autoreconf from overriding our COPYING and # INSTALL targets: -AUTOMAKE_OPTIONS = foreign 1.9 ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = \configure.ac +0
-0
configure.ac m4_define([serial_tests], [ · line 59
Quoted 7 lines
configure.ac +1
-1@@ -54,7 +54,7 @@ m4_define([serial_tests], [ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' ]) ]) -AM_INIT_AUTOMAKE(foreign serial_tests) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(foreign serial_tests subdir-objects 1.9) dnl NB: Do not [quote] this parameter. AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS
This looks trivial, but I'll have to NAK it in the current shape. It breaks building on at least RHEL-7.
When applying this patch, this happens:
Making all in openvpnmsica
make[3]: Entering directory `/home/davids/devel/OpenVPN/openvpn/src/openvpnmsica' Makefile:548: ../../src/tapctl/.deps/libopenvpnmsica_la-error.Plo: No such file or directory Makefile:549: ../../src/tapctl/.deps/libopenvpnmsica_la-tap.Plo: No such file or directory make[3]: *** No rule to make target ../../src/tapctl/.deps/libopenvpnmsica_la-tap.Plo'. Stop. make[3]: Leaving directory /home/davids/devel/OpenVPN/openvpn/src/openvpnmsica'
This needs more work to avoid this issue. It's also interesting that Windows code is suddenly being pulled into the dependency tracking on a plain Linux box.
Signature · 4 lines
kind regards, David Sommerseth OpenVPN Inc
Matthias Andree
NAKAm 17.07.20 um 17:05 schrieb Matthias Andree:
Makefile.am
Quoted 10 lines
Signed-off-by Matthias Andree <[email protected]...>--- Makefile.am | 1 - configure.ac | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)Makefile.am +0
-0
NAK - reject - superseded by newer patch.