diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-11-12 20:16:15 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-11-12 20:16:15 +0100 |
| commit | 7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3 (patch) | |
| tree | 8e867ed36cd40c5163ae490c9d8c1dc32a6094aa /src/Makefile.am | |
| parent | 8d461525388f799008118d7fe873079d2bd5ba8e (diff) | |
| download | dabmux-7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3.tar.gz dabmux-7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3.tar.bz2 dabmux-7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3.zip | |
update version generation for git, update INSTALL
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
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 \ |