Skip to content

Commit

Permalink
Merge pull request #138 from DICL/add-portable-automake-makefile
Browse files Browse the repository at this point in the history
Enable Makefile.am to be extendible.

Very small change, it allows to avoid merging the Makefile.am whenever we update VeloxMR. I merge it now since later we will forget about this.

It comes from VeloxMR repository. I cherry-picked the commit: cb1bb46

This pull request will release: 1.8.4
  • Loading branch information
vicentebolea authored Nov 3, 2017
2 parents 28f5e3e + d97f849 commit 19f6c46
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ AM_LDFLAGS = $(BOOST_LDFLAGS)
LDADD = libvdfs.la -lboost_system -lboost_serialization -lboost_coroutine -lboost_thread -lboost_context
endif

eclipse_node_SOURCES = src/targets/node_main.cc \
eclipse_node_main = src/targets/node_main.cc
eclipse_node_SOURCES = $(eclipse_node_main) \
src/network/asyncchannel.cc \
src/network/server.cc \
src/network/client_handler.cc \
Expand All @@ -62,7 +63,7 @@ eclipse_node_SOURCES = src/targets/node_main.cc \
src/fileleader/file_leader.cc \
src/fileleader/file_leader_router.cc

eclipse_node_LDADD = $(LDADD)
eclipse_node_LDADD = $(LDADD)

if LOGICAL_BLOCKS_FEATURE

Expand Down

0 comments on commit 19f6c46

Please sign in to comment.