X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=b7136a01fb13bfb1f664e2df747a67acfb23dfdc;hp=e6f2cede510879cb298e5ab324af271669486e89;hb=4e3b276aac6d42722fe8a90e8c4ea74bf59fdb37;hpb=50bd5d259677faf87bb3408e111d0e833d7ba9b4

diff --git a/Makefile.am b/Makefile.am
index e6f2ced..b7136a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,19 +20,31 @@
 
 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
+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)
 
-include_HEADERS = sigrokdecode.h
-noinst_HEADERS = sigrokdecode-internal.h
+library_includedir = $(includedir)/libsigrokdecode
+library_include_HEADERS = libsigrokdecode.h version.h
+noinst_HEADERS = libsigrokdecode-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokdecode.pc
@@ -46,4 +58,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)
+	${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+		-o $(DESTDIR)$(DECODERS_DIR)
+
+install-data-hook: install-decoders