aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-02-11 12:12:35 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-02-11 12:15:41 +0100
commit33864ac8cf65ff0ba46ea57ce5dde0db3999d7db (patch)
tree64f99524bd8aed5fbf053be34e802aa0bb0f8197
parent2b7633a5cea6fc26d66510487b3fc7377a2c1fa6 (diff)
downloaddabmux-0.4.2.tar.gz
dabmux-0.4.2.tar.bz2
dabmux-0.4.2.zip
add zmq.hpp to Makefile.am, update configure.acv0.4.2
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am3
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 274b0b2..29bd41a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@ This file contains information about the changes done to
the ODR-DabMux in this repository
2014-02-11: Matthias P. Braendli <matthias@mpb.li>
+ (v0.4.2)
+ * crc-dabmux:
+ Actually add zmq.hpp to Makefile.am
(v0.4.1)
* crc-dabmux:
Include zmq.hpp locally and prefer it over the
diff --git a/configure.ac b/configure.ac
index 997f544..2c9bcb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.61)
-AC_INIT([ODR-DabMux], [0.4.1], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux], [0.4.2], [matthias.braendli@mpb.li])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([-Wall subdir-objects])
diff --git a/src/Makefile.am b/src/Makefile.am
index 0097b2c..9eb2477 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,7 +88,8 @@ odr_dabmux_SOURCES =DabMux.cpp DabMux.h \
mpeg.h mpeg.c \
StatsServer.h StatsServer.cpp \
TcpServer.h TcpServer.cpp \
- TcpSocket.h TcpSocket.cpp
+ TcpSocket.h TcpSocket.cpp \
+ zmq.hpp
odr_bridgetest_CFLAGS =-DBRIDGE_TEST
odr_bridgetest_SOURCES =bridge.c \