X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=a9460e55ad9dd6b29b3e6f4bb7b564b8d3fe822a;hp=ccaa2dbe04be9e8f2b805d4bfa83a0444af6da5f;hb=7efd37c004833a4f1758bc99623850d89722636d;hpb=ab13922ca9fa2fc03e2a355166af5732f8e8a009

diff --git a/Makefile.am b/Makefile.am
index ccaa2db..a9460e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrokdecode project.
 ##
 ## Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
 ##
@@ -20,19 +20,31 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = 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
+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)"'
 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
@@ -43,7 +55,17 @@ MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 ChangeLog:
-	git --git-dir $(top_srcdir)/../.git log > ChangeLog || touch 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