spi: Define annotation rows.

[libsigrokdecode.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a9460e55ad9dd6b29b3e6f4bb7b564b8d3fe822a..b7136a01fb13bfb1f664e2df747a67acfb23dfdc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = contrib tests
+SUBDIRS = . contrib tests
 
 lib_LTLIBRARIES = libsigrokdecode.la
 
@@ -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
@@ -59,13 +59,15 @@ ChangeLog:
 
 dist-hook: ChangeLog
        $(MKDIR_P) $(distdir)/tools
-       cp tools/install-decoders $(distdir)/tools
+       cp ${top_srcdir}/tools/install-decoders $(distdir)/tools
        $(MKDIR_P) $(distdir)/decoders
-       tools/install-decoders -o $(distdir)/decoders
+       ${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+               -o $(distdir)/decoders
 
 install-decoders:
        $(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
-       tools/install-decoders -o $(DESTDIR)$(DECODERS_DIR)
+       ${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+               -o $(DESTDIR)$(DECODERS_DIR)
 
 install-data-hook: install-decoders