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

Merge pull request #60 from tmakatos/v0.7-devel 

don't use implicit rule when statically compiling emitters
This commit is contained in:
Joe Thornber 2016-05-09 11:28:15 +01:00
parent 3c02151a4f 8147d798be
commit ca8f6df229
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.in
View File

@ -129,10 +129,10 @@ CXX:=@CXX@
STRIP:=@STRIP@
OBJECTS:=$(subst .cc,.o,$(SOURCE))
# FIXME OBJECTS += $(PLUGIN_LIBS) doesn't work, probably because it's empty at
# FIXME EMITTERS += $(PLUGIN_LIBS) doesn't work, probably because it's empty at
# the time of use?
ifeq ("@STATIC@", "yes")
OBJECTS += contrib/*.a
EMITTERS += contrib/*.a
endif
TOP_DIR:=@top_srcdir@
@ -198,11 +198,11 @@ endif
#----------------------------------------------------------------
lib/libpdata.a: $(OBJECTS)
lib/libpdata.a: $(OBJECTS) $(EMITTERS)
@echo " [AR] $<"
$(V)ar -rv $@ $(OBJECTS) > /dev/null 2>&1
$(V)ar -rv $@ $(OBJECTS) $(EMITTERS) > /dev/null 2>&1
bin/pdata_tools: $(OBJECTS)
bin/pdata_tools: $(OBJECTS) $(EMITTERS)
@echo " [LD] $@"
$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS) $(CXXLIB)