From ee08497a002fbf0dc1884a9a679c3831215d7699 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 7 Feb 2014 09:18:43 +0100
Subject: fix versioning and tarball generation

---
 src/DabMod.cpp  | 10 ++++++++--
 src/Makefile.am | 15 ++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 66665bd..4adce76 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -78,8 +78,14 @@ 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, GITVERSION, __DATE__, __TIME__);
+    fprintf(out, "Welcome to %s %s, compiled at %s, %s\n\n",
+            PACKAGE,
+#if defined(GITVERSION)
+            GITVERSION,
+#else
+            VERSION,
+#endif
+            __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 df9a511..9145f47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,9 +17,9 @@
 # along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
 
 if IS_GIT_REPO
-GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\""
+GITVERSION_FLAGS = -DGITVERSION="\"`git describe`\""
 else
-GITVERSION_FLAGS = -DGITVERSION="\"-modified\""
+GITVERSION_FLAGS =
 endif
 
 if HAVE_INPUT_ZEROMQ_TEST
@@ -35,7 +35,7 @@ FFT_FLG=-ffast-math
 
 .PHONY: kiss_fft129 reed-solomon-4.0
 
-bin_PROGRAMS =  crc-dabmod
+bin_PROGRAMS =  odr-dabmod
 
 DabModulator.cpp:   $(FFT_DIR)
 
@@ -46,9 +46,9 @@ $(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 $(GITVERSION_FLAGS)
-crc_dabmod_LDADD    = $(ZMQ_LIBS)
-crc_dabmod_SOURCES =  DabMod.cpp \
+odr_dabmod_CPPFLAGS = $(FFT_INC) $(FFT_FLG) -msse -msse2 $(GITVERSION_FLAGS)
+odr_dabmod_LDADD    = $(ZMQ_LIBS)
+odr_dabmod_SOURCES =  DabMod.cpp \
                       PcDebug.h \
                       porting.c porting.h \
                       DabModulator.cpp DabModulator.h  \
@@ -89,9 +89,10 @@ crc_dabmod_SOURCES =  DabMod.cpp \
                       Resampler.cpp Resampler.h \
                       ConvEncoder.cpp ConvEncoder.h \
                       TimeInterleaver.cpp TimeInterleaver.h \
+					  ThreadsafeQueue.h \
 					  Log.cpp Log.h \
 					  RemoteControl.cpp RemoteControl.h
-nodist_crc_dabmod_SOURCES	=$(FFT_SRC)
+nodist_odr_dabmod_SOURCES	=$(FFT_SRC)
 
 dist_bin_SCRIPTS	=crc-dwap.py
 
-- 
cgit v1.2.3