X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=398103bbd28515c8a7fc86c49ebadcc7744d4a9a;hp=c4a9d475fa9cbf6400759b3c4902f69ef8a17800;hb=dcfb60a1658243c3130774fe00645e7fedb23211;hpb=20e950feb2fea1c6c106ced44e1fef3cf6d882ef diff --git a/Makefile.am b/Makefile.am index c4a9d47..398103b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,7 @@ noinst_HEADERS = libsigrokdecode-internal.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsigrokdecode.pc -EXTRA_DIST = Doxyfile contrib/sigrok-logo-notext.png +EXTRA_DIST = Doxyfile HACKING contrib/sigrok-logo-notext.png if HAVE_CHECK TESTS = tests/check_main @@ -60,18 +60,10 @@ tests_check_main_SOURCES = \ tests/check_decoder.c \ tests/check_inst.c \ tests/check_session.c -tests_check_main_CFLAGS = @check_CFLAGS@ +tests_check_main_CFLAGS = $(AM_CFLAGS) @check_CFLAGS@ tests_check_main_LDADD = $(top_builddir)/libsigrokdecode.la @check_LIBS@ tests_check_main_CPPFLAGS = $(CPPFLAGS_PYTHON) \ - -DDECODERS_DIR='"$(abs_top_builddir)/decoders"' -endif - -if BUILD_RUNTC -noinst_PROGRAMS = tests/runtc -tests_runtc_SOURCES = tests/runtc.c -tests_runtc_CPPFLAGS = $(CPPFLAGS_PYTHON) $(LIBSIGROK_CFLAGS) \ - -DDECODERS_DIR='"$(abs_top_builddir)/decoders"' -tests_runtc_LDFLAGS = -L$(top_builddir) $(LIBSIGROK_LIBS) $(LDFLAGS_PYTHON) -lsigrokdecode + -DDECODERS_DIR='"$(abs_top_srcdir)/decoders"' endif MAINTAINERCLEANFILES = ChangeLog @@ -89,8 +81,8 @@ dist-hook: ChangeLog install-decoders: $(MKDIR_P) $(DESTDIR)$(DECODERS_DIR) - ${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \ - -o $(DESTDIR)$(DECODERS_DIR) + $(PYTHON3) ${top_srcdir}/tools/install-decoders \ + -i ${top_srcdir}/decoders -o $(DESTDIR)$(DECODERS_DIR) install-data-hook: install-decoders