From 8189d8127e5ea2227a7e0ab9c0aa94675ca3d03d Mon Sep 17 00:00:00 2001
From: Daniel Elstner <daniel.kitta@gmail.com>
Date: Sun, 6 Sep 2015 12:06:27 +0200
Subject: Build: Modernize Autotools configuration

---
 Makefile.am | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index dc0e3cc..eb49775 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,14 +18,20 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+ACLOCAL_AMFLAGS = -I m4
+GNUMAKEFLAGS = --no-print-directory
+
+AM_CPPFLAGS = -D_POSIX_C_SOURCE=200112L -DDECODERS_DIR='"$(DECODERS_DIR)"'
+AM_CFLAGS = $(ST_EXTRA_CFLAGS) $(ST_WFLAGS) $(SIGROK_TEST_CFLAGS)
+
 noinst_PROGRAMS = decoder/runtc
 
 decoder_runtc_SOURCES = decoder/runtc.c
-decoder_runtc_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"'
+decoder_runtc_LDADD = $(SIGROK_TEST_LIBS)
 
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 ChangeLog:
-	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+	git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@
 
-- 
cgit v1.2.3-54-g00ecf