diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-11-12 20:24:49 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-11-12 20:24:49 +0100 |
| commit | e4068331e701c1a64a304225097a672ca8e2bf05 (patch) | |
| tree | a00055152173158756ffc98edfc060735eaff21e /src | |
| parent | df26d1ef3104371c8b66e0ba652547d1ae9cbe94 (diff) | |
| download | dabmod-e4068331e701c1a64a304225097a672ca8e2bf05.tar.gz dabmod-e4068331e701c1a64a304225097a672ca8e2bf05.tar.bz2 dabmod-e4068331e701c1a64a304225097a672ca8e2bf05.zip | |
make versioning git compatible, update INSTALL
Diffstat (limited to 'src')
| -rw-r--r-- | src/DabMod.cpp | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp index 1e8937d..3a73f32 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -79,7 +79,7 @@ void signalHandler(int signalNb) void printUsage(char* progName, FILE* out = stderr) { fprintf(out, "Welcome to %s %s%s, compiled at %s, %s\n\n", - PACKAGE, VERSION, HGVERSION, __DATE__, __TIME__); + PACKAGE, VERSION, GITVERSION, __DATE__, __TIME__); fprintf(out, "Usage with configuration file:\n"); fprintf(out, "\t%s -C config_file.ini\n\n", progName); 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 <http://www.gnu.org/licenses/>. -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 \ 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 \ |