AtsMapemSpatem and AtsRtcmem (24a0b4ca) · Commits · ITS - Intelligent Transport Systems / ITS

Makefile

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework
	defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS)		defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS)
	libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs		libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs

	ifneq (,$(windir))		ifeq (Windows_NT,$(OS))
	# Silence linker warnings.		# Silence linker warnings.
	LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc		LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc
	defines += WIN32		defines += WIN32
	@@ -91,8 +91,8 @@ echo: echo_sources
	@echo -e "defines: $(addsuffix \n, $(defines))"		@echo -e "defines: $(addsuffix \n, $(defines))"

	clean:		clean:
	rm -f $(outdir)/$(ATS)$(EXE) $(outdir)/.o $(outdir)/.cc $(outdir)/*.hh $(outdir)/.generate $(outdir)/libItsAsn.so		rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/$(ATS)/.generate $(outdir)/libItsAsn.so
	rm -f $(outdir)/asn1/.so $(outdir)/asn1/.o $(outdir)/asn1/.c $(outdir)/asn1/.h $(outdir)/asn1/Makefile.am.libasncodec		# rm -f $(outdir)/asn1/.so $(outdir)/asn1/.o $(outdir)/asn1/.c $(outdir)/asn1/.h $(outdir)/asn1/Makefile.am.libasncodec

	regen: force_regen $(outdir)/.generate		regen: force_regen $(outdir)/.generate
	force_regen:		force_regen:
	@@ -114,9 +114,9 @@ $(cc_objects) : $(outdir)/%.o : %.cc
	#$(gen_sources):		#$(gen_sources):
	# $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources)		# $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources)

	$(gen_sources): $(outdir)/.generate		$(gen_sources): $(outdir)/.generate-$(ATS)

	$(outdir)/.generate: Makefile $(tt_sources)		$(outdir)/.generate-$(ATS): Makefile $(tt_sources)
	$(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources)		$(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources)
	touch $@		touch $@

asn1/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -52,8 +52,8 @@ ASN1C:=asn1c
	#ASN1C_PATH =		#ASN1C_PATH =

	ifneq (, $(ASN1C_PATH))		ifneq (, $(ASN1C_PATH))
	OS=$(shell uname)		# OS=$(shell uname)
	ifneq (,$(windir))		ifneq (Windows_NT,$(OS))
	ASN1C:=$(ASN1C_PATH)/asn1c/asn1c -S $(ASN1C_PATH)/skeletons		ASN1C:=$(ASN1C_PATH)/asn1c/asn1c -S $(ASN1C_PATH)/skeletons
	else		else
	ASN1C:=$(ASN1C_PATH)/asn1c/asn1c.exe -S $(ASN1C_PATH)/skeletons		ASN1C:=$(ASN1C_PATH)/asn1c/asn1c.exe -S $(ASN1C_PATH)/skeletons

ccsrc/EncDec/module.mk

+18 −6

Original line number	Original line	Diff line number	Diff line
	@@ -10,18 +10,15 @@ sources := \
	# LibItsSremSsem_Encdec.cc		# LibItsSremSsem_Encdec.cc

	ifeq (AtsCAM, $(ATS))		ifeq (AtsCAM, $(ATS))
	sources += \		sources += LibItsCam_Encdec.cc
	LibItsCam_Encdec.cc
	endif		endif

	ifeq (AtsDENM, $(ATS))		ifeq (AtsDENM, $(ATS))
	sources += \		sources += LibItsDenm_Encdec.cc
	LibItsDenm_Encdec.cc
	endif		endif

	ifeq (AtsIVIM, $(ATS))		ifeq (AtsIVIM, $(ATS))
	sources += \		sources += LibItsIvim_Encdec.cc
	LibItsIvim_Encdec.cc
	endif		endif

	ifeq (AtsRSUsSimulator, $(ATS))		ifeq (AtsRSUsSimulator, $(ATS))
	@@ -42,6 +39,21 @@ sources += \
	LibItsDenm_Encdec.cc		LibItsDenm_Encdec.cc
	endif		endif

			ifeq (AtsSremSsem, $(ATS))
			sources += LibItsSremSsem_Encdec.cc
			endif

			ifeq (AtsMapemSpatem, $(ATS))
			sources += LibItsMapemSpatem_Encdec.cc
			endif

			ifeq (AtsRtcmem, $(ATS))
			sources += LibItsRtcmem_Encdec.cc
			endif

			ifeq (AtsPki, $(ATS))
			sources += LibItsPki_Encdec.cc
			endif

	# LibItsPki_Encdec.cc		# LibItsPki_Encdec.cc
	# LibItsEvcsn_Encdec.cc \		# LibItsEvcsn_Encdec.cc \

ccsrc/Ports/LibIts_ports/AdapterControlPort.hh

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,9 @@
	#ifdef LibItsSremSsem__TestSystem_HH		#ifdef LibItsSremSsem__TestSystem_HH
	#include "SremSsem_ports/AdapterControlPort_SremSsem.hh"		#include "SremSsem_ports/AdapterControlPort_SremSsem.hh"
	#endif		#endif
			#ifdef LibItsRtcmem__TestSystem_HH
			#include "Rtcmem_ports/AdapterControlPort_Rtcmem.hh"
			#endif
	#ifdef LibItsV2G__TestSystem_HH		#ifdef LibItsV2G__TestSystem_HH
	#include "V2G_ports/AdapterControlPort_V2G.hh"		#include "V2G_ports/AdapterControlPort_V2G.hh"
	#endif		#endif
	@@ -43,6 +46,9 @@
	#ifdef LibItsSremSsem__TestSystem_HH		#ifdef LibItsSremSsem__TestSystem_HH
	#include "AdapterControlPort_SremSsem.hh"		#include "AdapterControlPort_SremSsem.hh"
	#endif		#endif
			#ifdef LibItsRtcmem__TestSystem_HH
			#include "AdapterControlPort_Rtcmem.hh"
			#endif
	#ifdef LibItsGeoNetworking__TestSystem_HH		#ifdef LibItsGeoNetworking__TestSystem_HH
	#include "AdapterControlPort_GN.hh"		#include "AdapterControlPort_GN.hh"
	#endif		#endif

ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partC→ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@

	#include "RtcmemLayer.hh"		#include "RtcmemLayer.hh"

			#include "AdapterControlPort_Rtcmem.hh"
	//=============================================================================		//=============================================================================
	namespace LibItsRtcmem__TestSystem {		namespace LibItsRtcmem__TestSystem {