From 5d9ec838051c3451a59f9aa70eecde5c238a201c Mon Sep 17 00:00:00 2001 From: Stephen Dolan Date: Sat, 22 Jun 2013 20:53:28 +0100 Subject: [PATCH] Build libjq only once, and link it statically to ./jq This means ./jq is a real binary rather than a libtool turd. --- Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 67415e10..f320c66e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,11 +32,6 @@ AM_YFLAGS = --warnings=all -d ### libjq -# noinst for now? -lib_LIBRARIES = libjq.a -libjq_a_SOURCES = ${LIBJQ_SRC} -libjq_a_CFLAGS = $(AM_CFLAGS) - lib_LTLIBRARIES = libjq.la libjq_la_SOURCES = ${LIBJQ_SRC} libjq_la_LIBADD = -lm @@ -60,6 +55,7 @@ version.h: .remake-version-h bin_PROGRAMS = jq jq_SOURCES = main.c +jq_LDFLAGS = -static-libtool-libs jq_LDADD = libjq.la -lm ### Tests (make check)