Switch to a non-recursive automake setup.

(fewer files, less clutter)

diff --git a/.gitignore b/.gitignore
index 99fb0121067eee05798d7612a98179bff31204a7..8d361751dab955d3dfa66633af2b24386888002f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ version.h
 .deps
 Makefile
 Makefile.in
+.dirstamp
 
 # build leftovers
 *~

diff --git a/Makefile.am b/Makefile.am
index b7136a01fb13bfb1f664e2df747a67acfb23dfdc..c4a9d475fa9cbf6400759b3c4902f69ef8a17800 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,6 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = . contrib tests
-
 lib_LTLIBRARIES = libsigrokdecode.la
 
 libsigrokdecode_la_SOURCES = \
@@ -49,7 +47,32 @@ noinst_HEADERS = libsigrokdecode-internal.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokdecode.pc
 
-EXTRA_DIST = Doxyfile
+EXTRA_DIST = Doxyfile contrib/sigrok-logo-notext.png
+
+if HAVE_CHECK
+TESTS = tests/check_main
+check_PROGRAMS = ${TESTS}
+tests_check_main_SOURCES = \
+       libsigrokdecode.h \
+       tests/lib.h \
+       tests/check_main.c \
+       tests/check_core.c \
+       tests/check_decoder.c \
+       tests/check_inst.c \
+       tests/check_session.c
+tests_check_main_CFLAGS = @check_CFLAGS@
+tests_check_main_LDADD = $(top_builddir)/libsigrokdecode.la @check_LIBS@
+tests_check_main_CPPFLAGS = $(CPPFLAGS_PYTHON) \
+       -DDECODERS_DIR='"$(abs_top_builddir)/decoders"'
+endif
+
+if BUILD_RUNTC
+noinst_PROGRAMS = tests/runtc
+tests_runtc_SOURCES = tests/runtc.c
+tests_runtc_CPPFLAGS = $(CPPFLAGS_PYTHON) $(LIBSIGROK_CFLAGS) \
+       -DDECODERS_DIR='"$(abs_top_builddir)/decoders"'
+tests_runtc_LDFLAGS = -L$(top_builddir) $(LIBSIGROK_LIBS) $(LDFLAGS_PYTHON) -lsigrokdecode
+endif
 
 MAINTAINERCLEANFILES = ChangeLog
 

diff --git a/configure.ac b/configure.ac
index 09f7421e9eeed8f4577aa30a652c85a8195ce762..b7777adf45ce8fda0acb851b70c5476638e35863 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
 # We require at least automake 1.11 (needed for 'silent rules').
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -148,12 +148,7 @@ AC_SUBST(SRD_PACKAGE_VERSION)
 
 AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes")
 
-AC_CONFIG_FILES([Makefile
-                version.h
-                libsigrokdecode.pc
-                contrib/Makefile
-                tests/Makefile
-               ])
+AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc])
 
 AC_OUTPUT
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644 (file)
index 887f2ac..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the libsigrokdecode project.
-##
-## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## 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
-##
-
-EXTRA_DIST = sigrok-logo-notext.png
-

diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644 (file)
index 7b2f8d8..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-##
-## This file is part of the libsigrokdecode project.
-##
-## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## 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
-##
-
-if HAVE_CHECK
-TESTS = check_main
-check_PROGRAMS = ${TESTS}
-check_main_SOURCES = \
-       $(top_builddir)/libsigrokdecode.h \
-       lib.h \
-       check_main.c \
-       check_core.c \
-       check_decoder.c \
-       check_inst.c \
-       check_session.c
-check_main_CFLAGS = @check_CFLAGS@
-check_main_LDADD = $(top_builddir)/libsigrokdecode.la @check_LIBS@
-check_main_CPPFLAGS = $(CPPFLAGS_PYTHON) \
-       -DDECODERS_DIR='"$(abs_top_builddir)/decoders"'
-endif
-
-if BUILD_RUNTC
-noinst_PROGRAMS = runtc
-runtc_SOURCES = runtc.c
-runtc_CPPFLAGS = $(CPPFLAGS_PYTHON) $(LIBSIGROK_CFLAGS) \
-       -DDECODERS_DIR='"$(abs_top_builddir)/decoders"'
-runtc_LDFLAGS = -L$(top_builddir) $(LIBSIGROK_LIBS) $(LDFLAGS_PYTHON) -lsigrokdecode
-endif