X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=02f76d9e63fd77aad5f3d5006ba016aa9da0c5da;hb=d8d409590ce21116d85800c0eb8be287817a0eed;hp=873883eb9d9e475c0e81c876a055105ae3e430c8;hpb=7614222ca6cc73aae478d0ed659c0bcedfee4cc3;p=libsigrokdecode.git diff --git a/Makefile.am b/Makefile.am index 873883e..02f76d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,10 +20,10 @@ ACLOCAL_AMFLAGS = -I m4 AM_LIBTOOLFLAGS = --silent -MAKEFLAGS = --no-print-directory +GNUMAKEFLAGS = --no-print-directory DECODERS_DIR = $(pkgdatadir)/decoders -AM_CPPFLAGS = -D_DEFAULT_SOURCE -DDECODERS_DIR='"$(DECODERS_DIR)"' +AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"' # The tests CFLAGS are a superset of the libsigrokdecode CFLAGS. AM_CFLAGS = $(SRD_EXTRA_CFLAGS) $(SRD_WFLAGS) $(TESTS_CFLAGS) @@ -70,7 +70,7 @@ tests_main_SOURCES = \ tests/inst.c \ tests/session.c -tests_main_CPPFLAGS = -D_DEFAULT_SOURCE -DDECODERS_DIR='"$(abs_top_srcdir)/decoders"' +tests_main_CPPFLAGS = -DDECODERS_DIR='"$(abs_top_srcdir)/decoders"' tests_main_LDADD = libsigrokdecode.la $(SRD_EXTRA_LIBS) $(TESTS_LIBS) MAINTAINERCLEANFILES = ChangeLog @@ -78,7 +78,7 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog install-decoders ChangeLog: - git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog + git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@ dist-hook: ChangeLog $(MKDIR_P) $(distdir)/tools