Commit 829fe28f authored by nikolajev's avatar nikolajev
Browse files

COdec/adapter Makefile update

parent 8e813f3f

adapter/Makefile

+43 −1
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ else 
BOOST_LIB_SUFFIX  = $(if $(shell uname -o | grep Cygwin),-gcc-mt,-mt)

endif



ifeq '$(MSRP)' 'y'

T3DK_TTCN_SOURCES_STF407 = $(wildcard \

      ../ttcn/AtsImsIot/LibMsrp/trunk/LibMsrp_TypesAndValues.ttcn3 \

      )

else

# Original STF407 TTCN-3 source code

T3DK_TTCN_SOURCES_STF407 = $(wildcard \

      ../ttcn/LibCommon/ttcn/*.ttcn \
@@ -19,7 +24,9 @@ T3DK_TTCN_SOURCES_STF407 = $(wildcard \ 
      ../ttcn/AtsImsIot/AtsImsIot_Functions.ttcn \

      ../ttcn/AtsImsIot/AtsImsIot_TypesAndValues.ttcn \

      ../ttcn/AtsImsIot/AtsImsIot_TestConfiguration.ttcn \

	  ../ttcn/AtsImsIot/LibMsrp/trunk/LibMsrp_TypesAndValues.ttcn3 \

      )

endif



T3DK_TTCN_SOURCES = $(T3DK_TTCN_SOURCES_STF407)
@@ -27,7 +34,23 @@ T3DK_ROOT_MODULE = TestExecution 


T3DK_C_SOURCES    = $(wildcard src/*.c)

T3DK_CXX_SOURCES  = $(T3DK_CXX_TCI_SOURCES) $(T3DK_CXX_TRI_SOURCES)

T3DK_CXX_TCI_SOURCES  = $(wildcard src/libiot_codets.cpp src/libimssip_codets.cpp ../codec/c++/sdp_codets.cpp ../codec/c++/sip_codets.cpp)



ifeq '$(MSRP)' 'y'

T3DK_CXX_TCI_SOURCES  = $(wildcard \

		../codec/c++/empty_sip.cpp \

		../codec/c++/msrp_codets.cpp)

else

T3DK_CXX_TCI_SOURCES  = $(wildcard \

		src/libiot_codets.cpp \

		src/libimssip_codets.cpp \

		../codec/c++/sdp_codets.cpp \

		../codec/c++/sip_codets.cpp \

		../codec/c++/msrp_codets.cpp)

endif



ifeq '$(MSRP)' 'y'

T3DK_CXX_TRI_SOURCES  = $(wildcard)

else

T3DK_CXX_TRI_SOURCES  = $(wildcard \

			src/init.cpp \

      src/Ports/*.cpp \
@@ -42,6 +65,7 @@ T3DK_CXX_TRI_SOURCES = $(wildcard \ 
      src/Logger/*.cpp \

      src/Dispatcher/*.cpp \

      )

endif



T3DK_LIBS   = $(TOOL_SPECIFIC_LIBS) \

      -lboost_date_time$(BOOST_LIB_SUFFIX) \
@@ -49,20 +73,37 @@ T3DK_LIBS = $(TOOL_SPECIFIC_LIBS) \ 
      -lboost_regex$(BOOST_LIB_SUFFIX)



T3DK_CDGEN_HEADER       = src/codec.h



ifeq '$(MSRP)' 'y'

T3DK_CODETS             = $(wildcard \

			../codec/c++/common_sip_msrp.h \

			../codec/c++/empty_sip.cpp \

			../codec/c++/msrp_codets.h \

			../codec/c++/msrp_codets.cpp \

			)

else

T3DK_CODETS             = $(wildcard \

			src/codec.h \

			src/libatsiot_codets.h \

			src/libiot_codets.h \

			src/libiot_codets.cpp \

			src/libimssip_codets.h \

			src/libimssip_codets.cpp \

			../codec/c++/common_sip_msrp.h \

			../codec/c++/sip_codets.h \

			../codec/c++/sdp_codets.h \

			../codec/c++/msrp_codets.h \

			../codec/c++/sdp_codets.cpp \

			../codec/c++/sip_codets.cpp \

			../codec/c++/msrp_codets.cpp \

			)

endif



T3DK_DEBUG   = 1



ifeq '$(MSRP)' 'y'

CPPFLAGS    = -I../codec/c++

else

CPPFLAGS    = -Isrc \

      -Isrc/LowerTestAdapter \

      -Isrc/UpperTestAdapter \
@@ -70,6 +111,7 @@ CPPFLAGS = -Isrc \ 
      -Isrc/Logger \

      -Isrc/Dispatcher \

      -I../codec/c++

endif

 

CC      = gcc

CXX     = g++

adapter/src/codec.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include "sip_codets.h"

#include "sdp_codets.h"

//#include "isup_codets.h"

#include "msrp_codets.h"

#include "libatsiot_codets.h"



namespace t3devlib {

  namespace gen {