From bc7864dae8badd67545f47a5b7583c47e7ec3bba Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Wed, 13 Jun 2018 09:41:53 +0200 Subject: [PATCH] [build] Fix static build by including contrib/Makefile early (#100) Closes: #99 --- Makefile.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 34b7fe4..71d93a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,6 +29,8 @@ endif .PHONY: all all: $(PROGRAMS) $(TESTLIBS) +include contrib/Makefile + SOURCE=\ base/output_file_requirements.cc \ base/application.cc \ @@ -140,10 +142,8 @@ CXX:=@CXX@ STRIP:=@STRIP@ OBJECTS:=$(subst .cc,.o,$(SOURCE)) -# FIXME EMITTERS += $(PLUGIN_LIBS) doesn't work, probably because it's empty at -# the time of use? ifeq ("@STATIC@", "yes") -EMITTERS += contrib/*.a +EMITTERS += $(PLUGIN_LIBS) endif TOP_DIR:=@top_srcdir@ @@ -327,8 +327,6 @@ endif .PHONY: install -include contrib/Makefile - ifeq ("@TESTING@", "yes") include unit-tests/Makefile