From e4068331e701c1a64a304225097a672ca8e2bf05 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Tue, 12 Nov 2013 20:24:49 +0100 Subject: make versioning git compatible, 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 fa4b5bd..d47db59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,10 +16,10 @@ # You should have received a copy of the GNU General Public License # along with CRC-DADMOD. If not, see . -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="\"-modified\"" endif if HAVE_INPUT_ZEROMQ_TEST @@ -46,7 +46,7 @@ $(FFT_DIR): tar xzf $(top_srcdir)/lib/kiss_fft129.tar.gz -C $(top_builddir)/lib; \ fi -crc_dabmod_CPPFLAGS = $(FFT_INC) $(FFT_FLG) -msse -msse2 $(HGVERSION_FLAGS) +crc_dabmod_CPPFLAGS = $(FFT_INC) $(FFT_FLG) -msse -msse2 $(GITVERSION_FLAGS) crc_dabmod_LDADD = $(ZMQ_LIBS) crc_dabmod_SOURCES = DabMod.cpp \ PcDebug.h \ -- cgit v1.2.3