Commit 5c58e113 authored by Yann Garcia's avatar Yann Garcia
Browse files

Building issues fixed

parent c238160d

libNr5gcAsn1.mk

+2 −8
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ifneq (, $(ASN1C_PATH)) 
  ASN1C:=$(ASN1C_PATH)/asn1c/asn1c -S $(ASN1C_PATH)/skeletons

else

  ASN1C:=asn1c

  ASN1C:=asn1_compiler

  #ASN1C:=asn1_compiler

endif



LIB_MAKEFILE=Makefile.am.libasncodec
@@ -34,13 +34,7 @@ endif 


CFLAGS += $(ASN_MODULE_CFLAGS) -DPDU=$(firstword $(ASN_PDU)) $(HAS_PDU_COLLECTION) -fPIC -I.

CC = gcc -std=c99



ifeq ('asn1c', $(ASN1C))

    ASN1C_OPTIONS += -no-gen-example -fcompound-names -no-gen-XER -no-gen-JER -no-gen-APER -no-gen-print -no-gen-random-fill

else

    ASN1C_OPTIONS += -b -O

endif



ASN1C_OPTIONS += -fno-include-deps -findirect-choice -no-gen-example -fcompound-names -no-gen-XER -no-gen-JER -no-gen-APER -no-gen-print -no-gen-random-fill

ifeq (yes,$(DEBUG))

  CFLAGS += -g -O0 -DASN_EMIT_DEBUG=1

endif

ttcn/AtsNGAP/module.mk

+26 −15
Original line number Diff line number Diff line 
sources:= NGAP_TestCases.ttcn NGAP_Pics.ttcn  NGAP_Pixits.ttcn NGAP_Steps.ttcn NGAP_TestSystem.ttcn NGAP_TestConfiguration.ttcn NGAP_TestControl.ttcn NGAP_TCFunctions.ttcn

#sources:= S1AP_Pics.ttcn  S1AP_Pixits.ttcn  S1AP_Steps.ttcn  S1AP_TCFunctions.ttcn  S1AP_TestCases.ttcn  S1AP_TestConfiguration.ttcn  S1AP_TestControl.ttcn  S1AP_TestSystem.ttcn

suite := AtsNGAP

pdu := NGAP_PDU



modules:= ../NGAP_ \

sources:=                     \

  NGAP_TestCases.ttcn         \

  NGAP_Pics.ttcn              \

  NGAP_Pixits.ttcn            \

  NGAP_Steps.ttcn             \

  NGAP_TestSystem.ttcn        \

  NGAP_TestConfiguration.ttcn \

  NGAP_TestControl.ttcn       \

  NGAP_TCFunctions.ttcn



modules :=                                          \

  ../LibNGAP                                        \

  ../LibCommon                                      \

  ../../ccsrc/Ports/LibNGAP                         \
@@ -10,8 +20,9 @@ modules:= ../NGAP_ \ 
  ../../titan-test-system-framework/ccsrc/loggers   \

  ../../ccsrc/Protocols/NGAP_layer                  \

  ../../ccsrc/Protocols/NGAP                        \

	  ../../ccsrc/Asn1c

  ../../ccsrc/Asn1c                                 \

  ../modules/titan.TestPorts.Common_Components.Abstract_Socket





        #//../../ccsrc/Protocols/sctp \

        #//../../titan-test-system-framework/ccsrc/Protocols/Tcp \
 
	  #//../modules/titan.TestPorts.Common_Components.Abstract_Socket

ttcn/LibNGAP/module.mk

+9 −6
Original line number Diff line number Diff line 
sources := LibNGAP_TypesAndValues.ttcn \

	   LibNGAP_Interface.ttcn \

	   LibNGAP_Pixits.ttcn \

	   LibNGAP_Steps.ttcn  \

	   LibNGAP_Templates.ttcn \

	   LibNGAP_EncdecDeclarations.ttcn
 
sources :=                            \

  lib/LibNGAP_TypesAndValues.ttcn     \

  lib/LibNGAP_Pixits.ttcn             \

  lib/LibNGAP_Templates.ttcn          \

  lib/LibNGAP_EncdecDeclarations.ttcn \

  lib_system/LibNGAP_Interface.ttcn   \

  lib_system/LibNGAP_Steps.ttcn



modules := lib/asn1