aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-10-28 21:33:23 -0400
committerCory Fields <cory-nospam-@coryfields.com>2014-10-29 00:24:40 -0400
commit71697f97d3f9512f0af934070690c14f1c0d95ea (patch)
tree2c0f448b9504a045f09779364214e0703733897e /src/Makefile.am
parent723c7526368badda15df8ac1ffc047a0ab2e384a (diff)
downloadbitcoin-71697f97d3f9512f0af934070690c14f1c0d95ea.tar.xz
Separate protocol versioning from clientversion
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 91cc1b96e7..8253c4ab14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -146,7 +146,7 @@ obj/build.h: FORCE
@$(MKDIR_P) $(builddir)/obj
@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
$(abs_top_srcdir)
-libbitcoin_util_a-version.$(OBJEXT): obj/build.h
+libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
# server: shared between bitcoind and bitcoin-qt
libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS)
@@ -241,6 +241,7 @@ libbitcoin_util_a_SOURCES = \
compat/glibc_sanity.cpp \
compat/glibcxx_sanity.cpp \
chainparamsbase.cpp \
+ clientversion.cpp \
random.cpp \
rpcprotocol.cpp \
sync.cpp \
@@ -249,7 +250,6 @@ libbitcoin_util_a_SOURCES = \
utilstrencodings.cpp \
utilmoneystr.cpp \
utiltime.cpp \
- version.cpp \
$(BITCOIN_CORE_H)
if GLIBC_BACK_COMPAT
@@ -354,7 +354,7 @@ clean-local:
.rc.o:
@test -f $(WINDRES)
- $(AM_V_GEN) $(WINDRES) -i $< -o $@
+ $(AM_V_GEN) $(WINDRES) -DWINDRES_PREPROC -i $< -o $@
.mm.o:
$(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \