X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=97e5228517357d15a959015d11cb27ff9f98c1b0;hp=d3f91b89feaea549d6027619064c60562f4c4194;hb=3a67b032235e719dc4e74f735d1c95ef2d481a33;hpb=c1f86f02a149f46609273e1bd5b42696d544727a

diff --git a/Makefile.am b/Makefile.am
index d3f91b8..97e5228 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,37 +14,86 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
-ACLOCAL_AMFLAGS = -I autostuff
+ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --silent
+GNUMAKEFLAGS = --no-print-directory
 
-SUBDIRS = contrib decoders
+DECODERS_DIR = $(pkgdatadir)/decoders
+# Do not hard-code the decoders location on Windows.
+if WIN32
+AM_CPPFLAGS =
+else
+AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"'
+endif
+
+# The tests CFLAGS are a superset of the libsigrokdecode CFLAGS.
+AM_CFLAGS = $(SRD_EXTRA_CFLAGS) $(SRD_WFLAGS) $(TESTS_CFLAGS)
 
 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 version.c
+libsigrokdecode_la_SOURCES = \
+	srd.c \
+	session.c \
+	decoder.c \
+	instance.c \
+	log.c \
+	util.c \
+	exception.c \
+	module_sigrokdecode.c \
+	type_decoder.c \
+	error.c \
+	version.c
 
-libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
-			      -DDECODERS_DIR='"$(DECODERS_DIR)"'
-libsigrokdecode_la_LDFLAGS = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON)
+libsigrokdecode_la_LIBADD = $(SRD_EXTRA_LIBS) $(LIBSIGROKDECODE_LIBS)
+libsigrokdecode_la_LDFLAGS = -version-info $(SRD_LIB_VERSION) -no-undefined
 
-library_includedir = $(includedir)/libsigrokdecode
-library_include_HEADERS = libsigrokdecode.h
+pkginclude_HEADERS = libsigrokdecode.h
+nodist_pkginclude_HEADERS = version.h
 noinst_HEADERS = libsigrokdecode-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokdecode.pc
 
-EXTRA_DIST = Doxyfile
+EXTRA_DIST = Doxyfile HACKING contrib/sigrok-logo-notext.png
+
+if HAVE_CHECK
+TESTS = tests/main
+check_PROGRAMS = ${TESTS}
+endif
+
+tests_main_SOURCES = \
+	libsigrokdecode.h \
+	tests/lib.h \
+	tests/main.c \
+	tests/core.c \
+	tests/decoder.c \
+	tests/inst.c \
+	tests/session.c
+
+tests_main_CPPFLAGS = -DDECODERS_TESTDIR='"$(abs_top_srcdir)/decoders"'
+tests_main_LDADD = libsigrokdecode.la $(SRD_EXTRA_LIBS) $(TESTS_LIBS)
 
 MAINTAINERCLEANFILES = ChangeLog
 
-.PHONY: ChangeLog
+.PHONY: ChangeLog install-decoders
+
 ChangeLog:
-	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+	git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@
 
 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)
+	$(PYTHON3) ${top_srcdir}/tools/install-decoders \
+		-i ${top_srcdir}/decoders -o $(DESTDIR)$(DECODERS_DIR)
+
+install-data-hook: install-decoders