summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKumar Abhishek <abhishek@theembeddedkitchen.net>2014-05-10 04:32:05 +0700
committerUwe Hermann <uwe@hermann-uwe.de>2014-05-23 23:28:56 +0200
commit783b54337242e5c40da8ffc0fc18babbcd09bc67 (patch)
tree0aa6397a7243ef21634700da720c3edc0431c4c1
parent888bbe38a50a1e3224dcef68686a00e2754e8b47 (diff)
downloadlibsigrokdecode-783b54337242e5c40da8ffc0fc18babbcd09bc67.tar.gz
libsigrokdecode-783b54337242e5c40da8ffc0fc18babbcd09bc67.zip
libsigrokdecode: Fix make -j issue with build_runtc
The build of runtc caused issues with make -j as runtc was attempted to be linked with libsigrokdecode before libsigrokdecode was linked. Using LDADD to insert libsigrokdecode ensures that it links before runtc, ensuring the build completes correctly.
-rw-r--r--Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 5c88cc4..df8fb86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,10 +68,11 @@ endif
if BUILD_RUNTC
noinst_PROGRAMS = tests/runtc
+tests_runtc_LDADD = $(top_builddir)/libsigrokdecode.la
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
+tests_runtc_LDFLAGS = -L$(top_builddir) $(LIBSIGROK_LIBS) $(LDFLAGS_PYTHON)
endif
MAINTAINERCLEANFILES = ChangeLog