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

diff --git a/Makefile.am b/Makefile.am
index b2f4156..b7136a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,15 +20,15 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = contrib decoders tests
+SUBDIRS = . contrib 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,7 +39,7 @@ 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)
 
 library_includedir = $(includedir)/libsigrokdecode
@@ -58,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