X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=71e74e2697f391910a3cb2a1ec7ff92ca463be3a;hb=c357abd198bd195cb9ea015130dc76c8c7a33651;hp=c4a9d475fa9cbf6400759b3c4902f69ef8a17800;hpb=20e950feb2fea1c6c106ced44e1fef3cf6d882ef;p=libsigrokdecode.git

diff --git a/Makefile.am b/Makefile.am
index c4a9d47..71e74e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,8 @@ libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
 	-DDECODERS_DIR='"$(DECODERS_DIR)"'
 libsigrokdecode_la_LDFLAGS = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON)
 
+libsigrokdecode_la_LDFLAGS += -no-undefined
+
 library_includedir = $(includedir)/libsigrokdecode
 library_include_HEADERS = libsigrokdecode.h version.h
 noinst_HEADERS = libsigrokdecode-internal.h
@@ -47,31 +49,23 @@ 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
+TESTS = tests/main
 check_PROGRAMS = ${TESTS}
-tests_check_main_SOURCES = \
+tests_main_SOURCES = \
 	libsigrokdecode.h \
 	tests/lib.h \
-	tests/check_main.c \
-	tests/check_core.c \
-	tests/check_decoder.c \
-	tests/check_inst.c \
-	tests/check_session.c
-tests_check_main_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
+	tests/main.c \
+	tests/core.c \
+	tests/decoder.c \
+	tests/inst.c \
+	tests/session.c
+tests_main_CFLAGS = $(AM_CFLAGS) @check_CFLAGS@
+tests_main_LDADD = $(top_builddir)/libsigrokdecode.la @check_LIBS@
+tests_main_CPPFLAGS = $(CPPFLAGS_PYTHON) \
+	-DDECODERS_DIR='"$(abs_top_srcdir)/decoders"'
 endif
 
 MAINTAINERCLEANFILES = ChangeLog
@@ -89,8 +83,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