emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[build] Fix static build by including contrib/Makefile early (#100)

Browse Source 
Closes: #99
This commit is contained in:
Dennis Schridde 2018-06-13 09:41:53 +02:00 committed by Joe Thornber
parent 4b08c7793d
commit bc7864dae8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -29,6 +29,8 @@ endif
.PHONY: all .PHONY: all
all: $(PROGRAMS) $(TESTLIBS) all: $(PROGRAMS) $(TESTLIBS)
include contrib/Makefile
SOURCE=\ SOURCE=\
base/output_file_requirements.cc \ base/output_file_requirements.cc \
base/application.cc \ base/application.cc \
@ -140,10 +142,8 @@ CXX:=@CXX@
STRIP:=@STRIP@ STRIP:=@STRIP@
OBJECTS:=$(subst .cc,.o,$(SOURCE)) 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") ifeq ("@STATIC@", "yes")
EMITTERS += contrib/*.a EMITTERS += $(PLUGIN_LIBS)
endif endif
TOP_DIR:=@top_srcdir@ TOP_DIR:=@top_srcdir@
@ -327,8 +327,6 @@ endif
.PHONY: install .PHONY: install
include contrib/Makefile
ifeq ("@TESTING@", "yes") ifeq ("@TESTING@", "yes")
include unit-tests/Makefile include unit-tests/Makefile