X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=5227cc3ecb17f86db9b5881368317ebc7c9046c1;hp=15b5310d6ef3f2c3108f4bfdc8c62287149377ef;hb=3d14e7c9ac0155c0438b46dee267e3e16a6b8e3a;hpb=cdf156ba36def94a86453b017054470ee9ae7608

diff --git a/Makefile.am b/Makefile.am
index 15b5310..5227cc3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,19 +20,30 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = contrib decoders
+SUBDIRS = . contrib tests
 
 lib_LTLIBRARIES = libsigrokdecode.la
 
-libsigrokdecode_la_SOURCES = controller.c decoder.c log.c util.c exception.c \
-	module_sigrokdecode.c type_decoder.c type_logic.c version.c error.c
+libsigrokdecode_la_SOURCES = \
+	srd.c \
+	session.c \
+	decoder.c \
+	instance.c \
+	log.c \
+	util.c \
+	exception.c \
+	module_sigrokdecode.c \
+	type_decoder.c \
+	type_logic.c \
+	error.c \
+	version.c
 
 libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
-			      -DDECODERS_DIR='"$(DECODERS_DIR)"'
+	-DDECODERS_DIR='"$(DECODERS_DIR)"'
 libsigrokdecode_la_LDFLAGS = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON)
 
 library_includedir = $(includedir)/libsigrokdecode
-library_include_HEADERS = libsigrokdecode.h
+library_include_HEADERS = libsigrokdecode.h version.h
 noinst_HEADERS = libsigrokdecode-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -47,4 +58,14 @@ ChangeLog:
 	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
 
 dist-hook: ChangeLog
+	$(MKDIR_P) $(distdir)/tools
+	cp tools/install-decoders $(distdir)/tools
+	$(MKDIR_P) $(distdir)/decoders
+	tools/install-decoders -o $(distdir)/decoders
+
+install-decoders:
+	$(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
+	tools/install-decoders -o $(DESTDIR)$(DECODERS_DIR)
+
+install-data-hook: install-decoders