Commit 764be85e authored by YannGarcia's avatar YannGarcia

Fixed merge issue on AtsPki module.mk

parent e30bbb98
......@@ -8,7 +8,8 @@ sources := \
# LibItsPki_Encdec.cc \
# LibItsSremSsem_Encdec.cc
# AtsGeoNetworking does not require LibItsBtp_Encdec.cc
# AtsGeoNetworking and AtsPki do not require LibItsBtp_Encdec.cc
ifeq (AtsBTP, $(ATS))
sources += LibItsBtp_Encdec.cc
endif
......@@ -27,6 +28,7 @@ endif
ifeq (AtsRSUsSimulator, $(ATS))
sources += \
LibItsBtp_Encdec.cc \
LibItsCam_Encdec.cc \
LibItsDenm_Encdec.cc \
LibItsHttp_Encdec.cc \
......@@ -58,11 +60,7 @@ sources += LibItsRtcmem_Encdec.cc LibItsBtp_Encdec.cc
endif
ifeq (AtsPki, $(ATS))
sources := \
LibItsBtp_Encdec.cc \
LibItsGeoNetworking_Encdec.cc \
LibItsIpv6OverGeoNetworking_Encdec.cc \
LibItsSecurity_Encdec.cc \
sources += \
LibItsPki_Encdec.cc \
LibItsHttp_Encdec.cc
endif
......
suite := AtsPki
sources := ItsPki_Pixits.ttcn \
ItsPki_TestCases.ttcn \
ItsPki_TestControl.ttcn
modules := ../LibCommon \
../LibIts \
../LibIts/asn1/CAM \
../LibIts/asn1/DENM \
../LibIts/asn1/IS \
../LibIts/asn1/Security \
../LibIts/ttcn/Security \
../LibIts/ttcn/Pki \
../LibIts/ttcn/Http \
../LibIts/ttcn/GeoNetworking \
../LibIts/ttcn/Ipv6OverGeoNetworking \
../../ccsrc/Ports/LibIts_ports \
../../ccsrc/Ports/LibIts_ports/Http_ports \
../../ccsrc/Ports/LibIts_ports/Pki_ports \
../../ccsrc/Ports/LibIts_ports/GN_ports \
../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \
../../ccsrc/EncDec \
../../ccsrc/Framework \
../../ccsrc/Externals \
../../ccsrc/loggers \
../../ccsrc/geospacial \
../../ccsrc/Asn1c \
../../ccsrc/Protocols/UpperTester \
../../ccsrc/Protocols/Http \
../../ccsrc/Protocols/Security \
../../ccsrc/Protocols/GeoNetworking \
../modules/titan.TestPorts.HTTPmsg
# ../LibIts/ttcn/CAM \
# ../LibIts/ttcn/DENM \
# ../LibIts/ttcn/BTP \
# ../../ccsrc/Ports/LibIts_ports/CAM_ports \
# ../../ccsrc/Protocols/Pcap \
# ../../ccsrc/Protocols/ETH \
# ../../ccsrc/Protocols/BTP \
# ../../ccsrc/Protocols/CAM \
# ../../ccsrc/Protocols/DENM \
# ../../ccsrc/Protocols/IVIM \
# ../../ccsrc/Protocols/MapemSpatem \
# ../../ccsrc/Protocols/SremSsem \
#includes := \
# ../../ccsrc/Ports/LibIts_ports/BTP_ports
suite := AtsPki
sources := ItsPki_Pixits.ttcn \
ItsPki_TestCases.ttcn \
ItsPki_TestControl.ttcn
modules := ../LibCommon \
../LibIts \
../LibIts/asn1/CAM \
../LibIts/asn1/DENM \
../LibIts/asn1/IS \
../LibIts/asn1/Security \
../LibIts/ttcn/Security \
../LibIts/ttcn/Pki \
../LibIts/ttcn/Http \
../LibIts/ttcn/GeoNetworking \
../LibIts/ttcn/Ipv6OverGeoNetworking \
../../ccsrc/Ports/LibIts_ports \
../../ccsrc/Ports/LibIts_ports/Http_ports \
../../ccsrc/Ports/LibIts_ports/Pki_ports \
../../ccsrc/Ports/LibIts_ports/GN_ports \
../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \
../../ccsrc/EncDec \
../../ccsrc/Framework \
../../ccsrc/Externals \
../../ccsrc/loggers \
../../ccsrc/geospacial \
../../ccsrc/Asn1c \
../../ccsrc/Protocols/UpperTester \
../../ccsrc/Protocols/Http \
../../ccsrc/Protocols/Security \
../../ccsrc/Protocols/GeoNetworking \
../modules/titan.TestPorts.HTTPmsg
# ../LibIts/ttcn/CAM \
# ../LibIts/ttcn/DENM \
# ../LibIts/ttcn/BTP \
# ../../ccsrc/Ports/LibIts_ports/CAM_ports \
# ../../ccsrc/Protocols/Pcap \
# ../../ccsrc/Protocols/ETH \
# ../../ccsrc/Protocols/BTP \
# ../../ccsrc/Protocols/CAM \
# ../../ccsrc/Protocols/DENM \
# ../../ccsrc/Protocols/IVIM \
# ../../ccsrc/Protocols/MapemSpatem \
# ../../ccsrc/Protocols/SremSsem \
#includes := \
# ../../ccsrc/Ports/LibIts_ports/BTP_ports
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment