From 7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Tue, 12 Nov 2013 20:16:15 +0100 Subject: update version generation for git, update INSTALL --- src/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Makefile.in') diff --git a/src/Makefile.in b/src/Makefile.in index 3e4fe5f..0784a0f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -344,13 +344,13 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@IS_HG_REPO_FALSE@HGVERSION_FLAGS = -DHGVERSION="\"-modified\"" -@IS_HG_REPO_TRUE@HGVERSION_FLAGS = -DHGVERSION="\"`hg parents --template '-{node|short}'`\"" +@IS_GIT_REPO_FALSE@GITVERSION_FLAGS = -DGITVERSION="\"-exported\"" +@IS_GIT_REPO_TRUE@GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\"" FEC_FLAGS = FEC_LIBS = -lfec @HAVE_OUTPUT_ZEROMQ_TEST_FALSE@ZMQ_LIBS = @HAVE_OUTPUT_ZEROMQ_TEST_TRUE@ZMQ_LIBS = -lzmq -CRC_DabMux_CPPFLAGS = -I$(FARSYNC_DIR) $(HGVERSION_FLAGS) +CRC_DabMux_CPPFLAGS = -I$(FARSYNC_DIR) $(GITVERSION_FLAGS) CRC_DabMux_LDADD = $(FEC_LIBS) $(ZMQ_LIBS) -lpthread CRC_DabMux_SOURCES = DabMux.cpp \ dabInput.h dabInput.cpp \ -- cgit v1.2.3