X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=a8df8f6e280a454d48cee9b23532eec39045fad9;hb=2d557217c8e394e0bcacf3aea62f407ee804b06d;hp=2bbdb2c9d7107894fb94e004ef7d97fcdc966346;hpb=9576e005e18b2d0131e0fce5279a401cbe71c0f8;p=libsigrokdecode.git diff --git a/Makefile.am b/Makefile.am index 2bbdb2c..a8df8f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,12 @@ AM_LIBTOOLFLAGS = --silent GNUMAKEFLAGS = --no-print-directory DECODERS_DIR = $(pkgdatadir)/decoders -AM_CPPFLAGS = -D_POSIX_C_SOURCE=200112L -DDECODERS_DIR='"$(DECODERS_DIR)"' +# Do not hard-code the decoders location on Windows. +if WIN32 +AM_CPPFLAGS = +else +AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"' +endif # The tests CFLAGS are a superset of the libsigrokdecode CFLAGS. AM_CFLAGS = $(SRD_EXTRA_CFLAGS) $(SRD_WFLAGS) $(TESTS_CFLAGS) @@ -70,7 +75,7 @@ tests_main_SOURCES = \ tests/inst.c \ tests/session.c -tests_main_CPPFLAGS = -D_POSIX_C_SOURCE=200112L -DDECODERS_DIR='"$(abs_top_srcdir)/decoders"' +tests_main_CPPFLAGS = -DDECODERS_TESTDIR='"$(abs_top_srcdir)/decoders"' tests_main_LDADD = libsigrokdecode.la $(SRD_EXTRA_LIBS) $(TESTS_LIBS) MAINTAINERCLEANFILES = ChangeLog @@ -78,7 +83,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