Move session-specific functionality into session.c

[libsigrokdecode.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5cdb8bc9b4d10c3cc32ab87d73e9724c9aef502..2d6cd25d476ed5bd1dece28210ad74d268b91d9c 100644 (file)
--- 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>
 ##
@@ -18,20 +18,43 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# SUBDIRS = decoders
+ACLOCAL_AMFLAGS = -I autostuff
 
-# lib_LTLIBRARIES = libsigrokdecode.la
-noinst_LTLIBRARIES = libsigrokdecode.la
+SUBDIRS = contrib decoders tests
 
-libsigrokdecode_la_SOURCES = decode.c
+lib_LTLIBRARIES = libsigrokdecode.la
+
+libsigrokdecode_la_SOURCES = \
+       controller.c \
+       session.c \
+       decoder.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 = $(LDFLAGS_PYTHON)
+libsigrokdecode_la_LDFLAGS = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON)
+
+library_includedir = $(includedir)/libsigrokdecode
+library_include_HEADERS = libsigrokdecode.h version.h
+noinst_HEADERS = libsigrokdecode-internal.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrokdecode.pc
+
+EXTRA_DIST = Doxyfile
+
+MAINTAINERCLEANFILES = ChangeLog
 
-# include_HEADERS = sigrokdecode.h
-noinst_HEADERS = sigrokdecode.h
+.PHONY: ChangeLog
+ChangeLog:
+       git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
 
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = libsigrokdecode.pc
+dist-hook: ChangeLog