type_decoder: Fixup memory leak in Decoder.put() (meta, python)

[libsigrokdecode.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 71e74e2697f391910a3cb2a1ec7ff92ca463be3a..97e5228517357d15a959015d11cb27ff9f98c1b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,11 +14,23 @@
 ## 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
+
+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
 
@@ -32,18 +44,14 @@ libsigrokdecode_la_SOURCES = \
        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 = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON)
+libsigrokdecode_la_LIBADD = $(SRD_EXTRA_LIBS) $(LIBSIGROKDECODE_LIBS)
+libsigrokdecode_la_LDFLAGS = -version-info $(SRD_LIB_VERSION) -no-undefined
 
-libsigrokdecode_la_LDFLAGS += -no-undefined
-
-library_includedir = $(includedir)/libsigrokdecode
-library_include_HEADERS = libsigrokdecode.h version.h
+pkginclude_HEADERS = libsigrokdecode.h
+nodist_pkginclude_HEADERS = version.h
 noinst_HEADERS = libsigrokdecode-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -54,6 +62,8 @@ 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 \
@@ -62,17 +72,16 @@ tests_main_SOURCES = \
        tests/decoder.c \
        tests/inst.c \
        tests/session.c
-tests_main_CFLAGS = $(AM_CFLAGS) @check_CFLAGS@
-tests_main_LDADD = $(top_builddir)/libsigrokdecode.la @check_LIBS@
-tests_main_CPPFLAGS = $(CPPFLAGS_PYTHON) \
-       -DDECODERS_DIR='"$(abs_top_srcdir)/decoders"'
-endif
+
+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