usb_packet: s/NACK/NAK/.

[libsigrokdecode.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 731b90516583062b4609d2f835d1d61caeb0556a..b7136a01fb13bfb1f664e2df747a67acfb23dfdc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,13 +20,15 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = contrib decoders tests
+SUBDIRS = . contrib tests
 
 lib_LTLIBRARIES = libsigrokdecode.la
 
 libsigrokdecode_la_SOURCES = \
-       controller.c \
+       srd.c \
+       session.c \
        decoder.c \
+       instance.c \
        log.c \
        util.c \
        exception.c \
@@ -37,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
@@ -56,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