From 76e7f0f79c908bf7d0a447ea643dbcdde8f064d2 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 21 Mar 2015 14:30:09 +0100
Subject: Start big refactoring

Multiplexer in separate object
Replace pointers by shared_ptr
Switch to C++11
---
 src/Makefile.am | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 6ed0921..9a774c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,17 +39,11 @@ bin_PROGRAMS=odr-dabmux odr-bridgetest
 ZMQ_LIBS    =
 endif
 
-
-odr_dabmux_CPPFLAGS =-I$(FARSYNC_DIR) $(GITVERSION_FLAGS) \
-					 -Wall -Wextra -Wno-unused-parameter \
-					 -Wswitch-enum \
-					 -Wdisabled-optimization -Wvla \
-					 -Wuninitialized \
-					 -Wc++11-compat \
-					 -Wcast-align -Wcast-qual
-
+odr_dabmux_CFLAGS   =-Wall -std=c11 -I$(FARSYNC_DIR) $(GITVERSION_FLAGS)
+odr_dabmux_CXXFLAGS =-Wall -std=c++11 -I$(FARSYNC_DIR) $(GITVERSION_FLAGS)
 odr_dabmux_LDADD    =$(FEC_LIBS) $(ZMQ_LIBS) -lpthread -lboost_thread -lboost_system
 odr_dabmux_SOURCES  =DabMux.cpp DabMux.h \
+					 DabMultiplexer.cpp DabMultiplexer.h \
                      dabInput.h dabInput.cpp \
                      dabInputBridgeUdp.h dabInputBridgeUdp.cpp \
                      dabInputDabplusFifo.h dabInputDabplusFifo.cpp \
-- 
cgit v1.2.3