diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2020-03-06 11:39:03 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2020-03-06 11:39:03 +0200 |
| commit | ca31e4d2c9ff8e874a60e0b9c2d9a488c6f54b43 (patch) | |
| tree | b149d561cca40abe3e0a2e0da9baeaa08140a1aa /support | |
| parent | b2a997f7829dcbeab6fed42bd35f2381531c8e02 (diff) | |
| download | egawk-ca31e4d2c9ff8e874a60e0b9c2d9a488c6f54b43.tar.gz egawk-ca31e4d2c9ff8e874a60e0b9c2d9a488c6f54b43.tar.bz2 egawk-ca31e4d2c9ff8e874a60e0b9c2d9a488c6f54b43.zip | |
Squashed commit of the following:
commit 233cbc2a39b348eb66f70e7806f5fe2ef45db6a8
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Fri Mar 6 11:37:05 2020 +0200
Update ChangeLog files with Jannick's changes.
commit 3a6297d5a1e900f8de0ddc6dda5b08770483e318
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Fri Feb 21 13:10:40 2020 +0200
MSYS2 build changes.
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/Makefile.am | 4 | ||||
| -rw-r--r-- | support/Makefile.in | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 96da5cb4..f387fc3c 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,7 @@ +2020-03-06 Jannick <thirdedition@gmx.net> + + * Makefile.am: Replace AM_MAKEFLAGS with AM_CFLAGS and AM_LDFLAGS. + 2020-02-01 John E. Malmberg <wb8tyw@qsl.net> * dfa.c: Remove OpenVMS specific code. OpenVMS build diff --git a/support/Makefile.am b/support/Makefile.am index 3a72c15e..4dcce36f 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -23,8 +23,8 @@ ## process this file with automake to produce Makefile.in -# This insures that make flags get passed down to child makes. -AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)' +AM_CFLAGS = @CFLAGS@ +AM_LDFLAGS = @LDFLAGS@ # Stuff to include in the dist that doesn't need it's own # Makefile.am files diff --git a/support/Makefile.in b/support/Makefile.in index ac697798..38ae9d47 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -122,8 +122,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ $(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ - $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/socket.m4 \ + $(top_srcdir)/m4/triplet-transformation.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -333,9 +334,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# This insures that make flags get passed down to child makes. -AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)' +AM_CFLAGS = @CFLAGS@ +AM_LDFLAGS = @LDFLAGS@ # Stuff to include in the dist that doesn't need it's own # Makefile.am files |