diff options
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | INSTALL | 14 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/DabMod.cpp | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
7 files changed, 44 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1fe5e60 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ + +autom4te.cache +src/*.o +stamp-h1 +src/.deps +lib/kiss_fft129 +**/Makefile +config.log +config.h +config.status +src/crc-dabmod + +.*.swp @@ -3,7 +3,7 @@ Required dependencies: * Boost 1.41 or later * Optional ZeroMQ http://www.zeromq.org - Use --disable-output-zeromq if you don't have it + Use --disable-input-zeromq if you don't have it Simple install procedure: ========================= @@ -16,6 +16,18 @@ Simple install procedure: [ as root ] % make install # Install CRC-DABMOD +Nearly as simple install procedure using repository: +==================================================== + + * Download and install fec as above + * Clone the git repository + * Bootstrap autotools: + % aclocal && automake --gnu --add-missing && autoconf + or + % autoreconf + whichever works best + * Then use ./configure as above + Advanced install procedure: =========================== @@ -626,8 +626,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -IS_HG_REPO_FALSE -IS_HG_REPO_TRUE +IS_GIT_REPO_FALSE +IS_GIT_REPO_TRUE EGREP GREP BOOST_LDFLAGS @@ -6226,12 +6226,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if hg parents; then - IS_HG_REPO_TRUE= - IS_HG_REPO_FALSE='#' + if test -d '.git'; then + IS_GIT_REPO_TRUE= + IS_GIT_REPO_FALSE='#' else - IS_HG_REPO_TRUE='#' - IS_HG_REPO_FALSE= + IS_GIT_REPO_TRUE='#' + IS_GIT_REPO_FALSE= fi @@ -6555,8 +6555,8 @@ if test -z "${HAVE_INPUT_ZEROMQ_TEST_TRUE}" && test -z "${HAVE_INPUT_ZEROMQ_TEST as_fn_error $? "conditional \"HAVE_INPUT_ZEROMQ_TEST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${IS_HG_REPO_TRUE}" && test -z "${IS_HG_REPO_FALSE}"; then - as_fn_error $? "conditional \"IS_HG_REPO\" was never defined. +if test -z "${IS_GIT_REPO_TRUE}" && test -z "${IS_GIT_REPO_FALSE}"; then + as_fn_error $? "conditional \"IS_GIT_REPO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 76845d0..b6612dd 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,7 @@ AC_COMPILE_IFELSE( [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_DEFINE([M_PIl], [M_PI], [Replacing define])]) AC_LANG_POP([C++]) -AM_CONDITIONAL([IS_HG_REPO], [hg parents]) +AM_CONDITIONAL([IS_GIT_REPO], [test -d '.git']) # Checks for library functions. # Commented to remove rpl_malloc linking error 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 \ |