From 2c9ee45c8c7836674194739a2bcc4bb4db08d27e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 9 Apr 2019 21:27:36 +0800 Subject: [PATCH 1/4] [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 df590b4..5e9f30a 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@ @@ -318,8 +318,6 @@ endif .PHONY: install -include contrib/Makefile - ifeq ("@TESTING@", "yes") include unit-tests/Makefile -- 2.19.1