Message ID | 20200717150510.124442-1-matthias.andree@gmx.de |
---|---|
State | Rejected |
Headers | show |
Series | [Openvpn-devel,1/2] Automake options: add subdir-objects, and clean up | expand |
On 17/07/2020 17:05, Matthias Andree wrote: > diff --git a/Makefile.am b/Makefile.am > index 439120e4..e4125447 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -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 = \ > diff --git a/configure.ac b/configure.ac > index 45148892..9d6510ca 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -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.
Am 17.07.20 um 17:05 schrieb Matthias Andree: > Signed-off-by: Matthias Andree <matthias.andree@gmx.de> > --- > Makefile.am | 1 - > configure.ac | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 439120e4..e4125447 100644 > --- a/Makefile.am > +++ b/Makefile.am NAK - reject - superseded by newer patch.
diff --git a/Makefile.am b/Makefile.am index 439120e4..e4125447 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 = \ diff --git a/configure.ac b/configure.ac index 45148892..9d6510ca 100644 --- a/configure.ac +++ b/configure.ac @@ -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
Signed-off-by: Matthias Andree <matthias.andree@gmx.de> --- Makefile.am | 1 - configure.ac | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.25.4