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.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 0817c90..a9000ca 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -361,15 +361,15 @@ 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="\"-modified\"" +@IS_GIT_REPO_TRUE@GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\"" @HAVE_INPUT_ZEROMQ_TEST_FALSE@ZMQ_LIBS = @HAVE_INPUT_ZEROMQ_TEST_TRUE@ZMQ_LIBS = -lzmq FFT_DIR = $(top_builddir)/lib/kiss_fft129 FFT_INC = -I$(FFT_DIR) -I$(FFT_DIR)/tools FFT_SRC = $(FFT_DIR)/kiss_fft.c $(FFT_DIR)/kiss_fft.h $(FFT_DIR)/tools/kiss_fftr.c $(FFT_DIR)/tools/kiss_fftr.h kiss_fftsimd.c kiss_fftsimd.h FFT_FLG = -ffast-math -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