From: Kumar Abhishek <redacted>
Date: Fri, 9 May 2014 21:32:05 +0000 (+0700)
Subject: libsigrokdecode: Fix make -j issue with build_runtc
X-Git-Tag: libsigrokdecode-0.4.0~228
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=783b54337242e5c40da8ffc0fc18babbcd09bc67;ds=sidebyside

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.
---

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