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.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 65cb221..b20f1ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,10 +21,10 @@ bin_PROGRAMS=CRC-DabMux CRC-BridgeTest -if IS_HG_REPO -HGVERSION_FLAGS = -DHGVERSION="\"`hg parents --template '-{node|short}'`\"" +if IS_GIT_REPO +GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\"" else -HGVERSION_FLAGS = -DHGVERSION="\"-modified\"" +GITVERSION_FLAGS = -DGITVERSION="\"-exported\"" endif FEC_FLAGS = @@ -36,7 +36,7 @@ else ZMQ_LIBS = endif -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