X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=15b5310d6ef3f2c3108f4bfdc8c62287149377ef;hp=4f34e5a192edef0b48057bb9be5d6e686f5d702f;hb=3abc83b996547a69bad906ec748f30874aae4796;hpb=394b74dca66d540cae154dfeb3bea4253db4304d

diff --git a/Makefile.am b/Makefile.am
index 4f34e5a..15b5310 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,30 +20,31 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = decoders
+SUBDIRS = contrib decoders
 
 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
+	module_sigrokdecode.c type_decoder.c type_logic.c version.c error.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
+noinst_HEADERS = libsigrokdecode-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokdecode.pc
 
 EXTRA_DIST = Doxyfile
 
-DISTCLEANFILES = ChangeLog
+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