summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/gr_git.m423
-rw-r--r--configure.ac2
-rw-r--r--gcell/gcell.pc.in2
-rw-r--r--gcell/lib/Makefile.am10
-rw-r--r--gnuradio-core/src/lib/Makefile.am2
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_source.h2
-rw-r--r--gr-gcell/src/Makefile.am2
-rw-r--r--gr-howto-write-a-block/Makefile.common2
-rw-r--r--gr-howto-write-a-block/config/gr_git.m423
-rw-r--r--gr-qtgui/src/lib/waterfallGlobalData.h1
10 files changed, 37 insertions, 32 deletions
diff --git a/config/gr_git.m4 b/config/gr_git.m4
index 5e8aa663b..c4f1ea0c0 100644
--- a/config/gr_git.m4
+++ b/config/gr_git.m4
@@ -30,18 +30,23 @@ AC_DEFUN([GR_GIT],[
AC_MSG_CHECKING([git description of current commit])
if (cd $srcdir && $GIT describe >/dev/null 2>&1); then
GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long`
- GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'`
- GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'`
- GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'`
# Release candidate tags create an extra -rcX field
- if test x`echo $GIT_DESCRIBE | cut -f 1- -d '-' --output-delimiter=' ' | wc -w` = x4; then
- GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'`
- GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'`
- GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'`
- fi
+ case $GIT_DESCRIBE in
+ *-*-*-*)
+ GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'`
+ GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'`
+ GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'`
+ ;;
+ *-*-*)
+ GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'`
+ GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'`
+ GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'`
+ ;;
+ esac
+
AC_MSG_RESULT([$GIT_DESCRIBE])
else
- AC_MSG_RESULT([unable to find, using current commit])
+ AC_MSG_RESULT([no tag in history, using current commit])
GIT_TAG=''
GIT_SEQNO=''
GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8`
diff --git a/configure.ac b/configure.ac
index c912d9891..4ec2644ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,7 +293,7 @@ dnl AX_BOOST_TEST_EXEC_MONITOR
dnl AX_BOOST_UNIT_TEST_FRAMEWORK
dnl AX_BOOST_WSERIALIZATION
-BUILD_DATE=`date -R -u`
+BUILD_DATE=`date -u +"%a, %d %b %Y %R:%S"`
AC_SUBST(BUILD_DATE)
dnl SYSCONFDIR substitution
diff --git a/gcell/gcell.pc.in b/gcell/gcell.pc.in
index e602ff7c3..1a3cd9c26 100644
--- a/gcell/gcell.pc.in
+++ b/gcell/gcell.pc.in
@@ -7,6 +7,6 @@ gcell_embedspu_libtool=@bindir@/gcell-embedspu-libtool
Name: gcell
Description: The GNU Radio SPE scheduler and RPC mechanism
Requires:
-Version: @VERSION@
+Version: @LIBVER@
Libs: -L${libdir} -lgcell
Cflags: -I${includedir} @DEFINES@
diff --git a/gcell/lib/Makefile.am b/gcell/lib/Makefile.am
index fa9c4a003..7a727ea84 100644
--- a/gcell/lib/Makefile.am
+++ b/gcell/lib/Makefile.am
@@ -27,10 +27,10 @@ SUBDIRS = spu runtime general wrapper .
lib_LTLIBRARIES = libgcell.la libgcell-qa.la
libgcell_la_SOURCES =
-libgcell_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
libgcell_qa_la_SOURCES =
-libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
libgcell_la_LIBADD = \
runtime/libruntime.la \
@@ -42,9 +42,3 @@ libgcell_qa_la_LIBADD = \
runtime/libruntime-qa.la \
wrapper/libwrapper-qa.la \
$(CPPUNIT_LIBS)
-
-
-
-
-
-
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index 86e3aa1f6..f3a3accdb 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -69,4 +69,4 @@ libgnuradio_core_qa_la_LIBADD = \
bin_PROGRAMS = gnuradio-config-info
gnuradio_config_info_SOURCES = gnuradio-config-info.cc
-gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_PROGRAM_OPTIONS_LIB)
+gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB)
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h
index e23231aa7..5d30fad30 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.h
+++ b/gnuradio-core/src/lib/io/gr_udp_source.h
@@ -95,7 +95,7 @@ class gr_udp_source : public gr_sync_block
/*! \brief return the PAYLOAD_SIZE of the socket */
int payload_size() { return d_payload_size; }
- /*! \breif return the port number of the socket */
+ /*! \brief return the port number of the socket */
int get_port();
// should we export anything else?
diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am
index f44095b47..63dc156b1 100644
--- a/gr-gcell/src/Makefile.am
+++ b/gr-gcell/src/Makefile.am
@@ -52,7 +52,7 @@ libgnuradio_gcell_la_LIBADD = \
$(GNURADIO_CORE_LA) \
$(GCELL_LA)
-libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED)
+libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
# ----------------------------------------------------------------
diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common
index 8423671a3..15a521698 100644
--- a/gr-howto-write-a-block/Makefile.common
+++ b/gr-howto-write-a-block/Makefile.common
@@ -40,7 +40,7 @@ AM_CPPFLAGS = \
# these are used by both SWIG and CXX
STD_DEFINES_AND_INCLUDES = \
$(DEFINES) \
- -I$(abs_top_srcdir)/include \
+ -I$(abs_top_srcdir)/lib \
-I$(GNURADIO_CORE_INCLUDEDIR) \
-I$(GNURADIO_CORE_INCLUDEDIR)/swig
diff --git a/gr-howto-write-a-block/config/gr_git.m4 b/gr-howto-write-a-block/config/gr_git.m4
index 5e8aa663b..c4f1ea0c0 100644
--- a/gr-howto-write-a-block/config/gr_git.m4
+++ b/gr-howto-write-a-block/config/gr_git.m4
@@ -30,18 +30,23 @@ AC_DEFUN([GR_GIT],[
AC_MSG_CHECKING([git description of current commit])
if (cd $srcdir && $GIT describe >/dev/null 2>&1); then
GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long`
- GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'`
- GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'`
- GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'`
# Release candidate tags create an extra -rcX field
- if test x`echo $GIT_DESCRIBE | cut -f 1- -d '-' --output-delimiter=' ' | wc -w` = x4; then
- GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'`
- GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'`
- GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'`
- fi
+ case $GIT_DESCRIBE in
+ *-*-*-*)
+ GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'`
+ GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'`
+ GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'`
+ ;;
+ *-*-*)
+ GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'`
+ GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'`
+ GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'`
+ ;;
+ esac
+
AC_MSG_RESULT([$GIT_DESCRIBE])
else
- AC_MSG_RESULT([unable to find, using current commit])
+ AC_MSG_RESULT([no tag in history, using current commit])
GIT_TAG=''
GIT_SEQNO=''
GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8`
diff --git a/gr-qtgui/src/lib/waterfallGlobalData.h b/gr-qtgui/src/lib/waterfallGlobalData.h
index 6e34ce5b1..247e0ae91 100644
--- a/gr-qtgui/src/lib/waterfallGlobalData.h
+++ b/gr-qtgui/src/lib/waterfallGlobalData.h
@@ -3,6 +3,7 @@
#include <qwt_raster_data.h>
#include <qwt3d_function.h>
+#include <inttypes.h>
class Waterfall3DDisplayPlot;
generated by cgit (git 2.34.1) at 2024-12-20 18:16:03 +0000