X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=71e74e2697f391910a3cb2a1ec7ff92ca463be3a;hp=b2f4156835c984b7885e728b4183af042ec19443;hb=bcd4e47e8cc688d2a04c6fbfde1e0a354405f769;hpb=190b71cfebc1dd000d3203c7300a10afd96c1201

diff --git a/Makefile.am b/Makefile.am
index b2f4156..71e74e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,15 +20,13 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = contrib decoders tests
-
 lib_LTLIBRARIES = libsigrokdecode.la
 
 libsigrokdecode_la_SOURCES = \
 	srd.c \
-	controller.c \
 	session.c \
 	decoder.c \
+	instance.c \
 	log.c \
 	util.c \
 	exception.c \
@@ -39,9 +37,11 @@ libsigrokdecode_la_SOURCES = \
 	version.c
 
 libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
-			      -DDECODERS_DIR='"$(DECODERS_DIR)"'
+	-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
@@ -49,7 +49,24 @@ noinst_HEADERS = libsigrokdecode-internal.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokdecode.pc
 
-EXTRA_DIST = Doxyfile
+EXTRA_DIST = Doxyfile HACKING contrib/sigrok-logo-notext.png
+
+if HAVE_CHECK
+TESTS = tests/main
+check_PROGRAMS = ${TESTS}
+tests_main_SOURCES = \
+	libsigrokdecode.h \
+	tests/lib.h \
+	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
 
@@ -58,4 +75,16 @@ ChangeLog:
 	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
 
 dist-hook: ChangeLog
+	$(MKDIR_P) $(distdir)/tools
+	cp ${top_srcdir}/tools/install-decoders $(distdir)/tools
+	$(MKDIR_P) $(distdir)/decoders
+	${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+		-o $(distdir)/decoders
+
+install-decoders:
+	$(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
+	$(PYTHON3) ${top_srcdir}/tools/install-decoders \
+		-i ${top_srcdir}/decoders -o $(DESTDIR)$(DECODERS_DIR)
+
+install-data-hook: install-decoders