regen_makefile.sh: files/flags in separate lines

Make all regen_makefile.sh more readable and diff friendly by moving each entry in FILES and CPPFLAGS_TTCN3 into separate lines. Order entries alphabetically. Related: OS#5252 Change-Id: I6b6866eb9f6ec6232e4ae434517457a4c8c1c050
1 year ago · 2e0e624060
parent 93a7b8b758
commit 2e0e624060
29 changed files with 562 additions and 66 deletions
--- a/SCCP_Test/regen_makefile.sh
+++ b/SCCP_Test/regen_makefile.sh
@ -2,6 +2,12 @@

 MAIN=SCCP_Testcases.ttcn

-FILES="*.ttcn *.ttcnpp"
+FILES="
+	*.ttcn
+	*.ttcnpp
+"
+
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh $MAIN $FILES
--- a/bsc-nat/regen_makefile.sh
+++ b/bsc-nat/regen_makefile.sh
@ -2,8 +2,31 @@

 MAIN=BSCNAT_Tests.ttcn

-FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc"
+FILES="
+	*.c
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	MGCP_CodecPort_CtrlFunctDef.cc
+	Native_FunctionDefs.cc
+	RTP_EncDec.cc
+	SCCP_EncDec.cc
+	SDP_EncDec.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_MGCP
+	-DIPA_EMULATION_SCCP
+	-DRAN_EMULATION_BSSAP
+	-DRAN_EMULATION_CTRL
+	-DRAN_EMULATION_MGCP
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh $MAIN $FILES
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@ -2,8 +2,36 @@

 MAIN=BSC_Tests.ttcn

-FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc CBSP_CodecPort_CtrlFunctdef.cc StatsD_CodecPort_CtrlFunctdef.cc *.c"
+FILES="
+	*.c
+	*.ttcn
+	*.ttcnpp
+	CBSP_CodecPort_CtrlFunctdef.cc
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	IuUP_EncDec.cc
+	MGCP_CodecPort_CtrlFunctDef.cc
+	Native_FunctionDefs.cc
+	RTP_CodecPort_CtrlFunctDef.cc
+	RTP_EncDec.cc
+	SCTPasp_PT.cc
+	SDP_EncDec.cc
+	StatsD_CodecPort_CtrlFunctdef.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_MGCP
+	-DIPA_EMULATION_RSL
+	-DIPA_EMULATION_SCCP
+	-DRAN_EMULATION_BSSAP
+	-DRAN_EMULATION_CTRL
+	-DRAN_EMULATION_MGCP
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh $MAIN $FILES
--- a/bts/regen_makefile.sh
+++ b/bts/regen_makefile.sh
@ -1,7 +1,29 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TRXC_CodecPort_CtrlFunctDef.cc L1CTL_PortType_CtrlFunctDef.cc TELNETasp_PT.cc IuUP_EncDec.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc"
+FILES="
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	IuUP_EncDec.cc
+	L1CTL_PortType_CtrlFunctDef.cc
+	Native_FunctionDefs.cc
+	RLCMAC_EncDec.cc
+	RTP_CodecPort_CtrlFunctDef.cc
+	RTP_EncDec.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	TRXC_CodecPort_CtrlFunctDef.cc
+	UD_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_OML -DIPA_EMULATION_CTRL -DIPA_EMULATION_OSMO_PCU"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_OML
+	-DIPA_EMULATION_OSMO_PCU
+	-DIPA_EMULATION_RSL
+"

 ../regen-makefile.sh BTS_Tests.ttcn $FILES
--- a/cbc/regen_makefile.sh
+++ b/cbc/regen_makefile.sh
@ -1,10 +1,27 @@
 #!/bin/bash

-FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc SCTPasp_PT.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc CBSP_CodecPort_CtrlFunctdef.cc SABP_EncDec.cc SABP_CodecPort_CtrlFunctDef.cc "
-#FILES+="*.ttcnpp "
-FILES+="*.asn"
+FILES="
+	*.asn
+	*.ttcn
+	Abstract_Socket.cc
+	CBSP_CodecPort_CtrlFunctdef.cc
+	HTTPmsg_MessageLen_Function.cc
+	HTTPmsg_PT.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	JSON_EncDec.cc
+	Native_FunctionDefs.cc
+	SABP_CodecPort_CtrlFunctDef.cc
+	SABP_EncDec.cc
+	SCTPasp_PT.cc
+	TCCConversion.cc
+	TCCEncoding.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3=""
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh CBC_Tests.ttcn $FILES

--- a/ccid/regen_makefile.sh
+++ b/ccid/regen_makefile.sh
@ -1,6 +1,13 @@
 #!/bin/sh

-FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc "
+FILES="
+	*.ttcn
+	Native_FunctionDefs.cc
+	USB_PT.cc
+"
+
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh CCID_Tests.ttcn $FILES

--- a/fr-net/regen_makefile.sh
+++ b/fr-net/regen_makefile.sh
@ -1,10 +1,21 @@
 #!/bin/bash

-FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc "
-FILES+="AF_PACKET_PT.cc "
-FILES+="Native_FunctionDefs.cc "
-FILES+="LLC_EncDec.cc TELNETasp_PT.cc "
+FILES="
+	*.ttcn
+	*.ttcnpp
+	AF_PACKET_PT.cc
+	BSSGP_EncDec.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	LLC_EncDec.cc
+	Native_FunctionDefs.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DNS_EMULATION_FR"
+export CPPFLAGS_TTCN3="
+	-DNS_EMULATION_FR
+"

 ../regen-makefile.sh FRNET_Tests.ttcn $FILES
--- a/fr/regen_makefile.sh
+++ b/fr/regen_makefile.sh
@ -1,9 +1,22 @@
 #!/bin/bash

-FILES="*.ttcn *.ttcnpp IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc Native_FunctionDefs.cc "
-FILES+="BSSGP_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc "
-FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh "
+FILES="
+	*.ttcn
+	*.ttcnpp
+	AF_PACKET_PT.cc
+	AF_PACKET_PT.hh
+	BSSGP_EncDec.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	LLC_EncDec.cc
+	Native_FunctionDefs.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DNS_EMULATION_FR"
+export CPPFLAGS_TTCN3="
+	-DNS_EMULATION_FR
+"

 ../regen-makefile.sh FR_Tests.ttcn $FILES
--- a/gbproxy/regen_makefile.sh
+++ b/gbproxy/regen_makefile.sh
@ -1,9 +1,34 @@
 #!/bin/bash

-FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc  SCTPasp_PT.cc "
-FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh "
+FILES="
+	*.ttcn
+	*.ttcnpp
+	AF_PACKET_PT.cc
+	AF_PACKET_PT.hh
+	BSSGP_EncDec.cc
+	GTPC_EncDec.cc
+	GTPU_EncDec.cc
+	GTP_CodecPort_CtrlFunctDef.cc
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	LLC_EncDec.cc
+	Native_FunctionDefs.cc
+	RLCMAC_EncDec.cc
+	SCCP_EncDec.cc
+	SCTPasp_PT.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DBSSGP_EM_L3 -DNS_EMULATION_FR"
+export CPPFLAGS_TTCN3="
+	-DBSSGP_EM_L3
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_GSUP
+	-DNS_EMULATION_FR
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh GBProxy_Tests.ttcn $FILES

--- a/ggsn_tests/regen_makefile.sh
+++ b/ggsn_tests/regen_makefile.sh
@ -1,5 +1,24 @@
 #!/bin/sh

-FILES="*.ttcn IPL4asp_PT.cc  IPL4asp_discovery.cc  TCCConversion.cc  TCCInterface.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc ICMPv6_EncDec.cc IP_EncDec.cc Native_FunctionDefs.cc UDP_EncDec.cc ICMP_EncDec.cc TELNETasp_PT.cc BSSGP_EncDec.cc"
+FILES="
+	*.ttcn
+	BSSGP_EncDec.cc
+	GTPC_EncDec.cc
+	GTPU_EncDec.cc
+	GTP_CodecPort_CtrlFunctDef.cc
+	ICMP_EncDec.cc
+	ICMPv6_EncDec.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	IP_EncDec.cc
+	Native_FunctionDefs.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	UDP_EncDec.cc
+"
+
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh GGSN_Tests.ttcn $FILES
--- a/hlr/regen_makefile.sh
+++ b/hlr/regen_makefile.sh
@ -2,8 +2,26 @@

 MAIN="HLR_Tests.ttcn"

-FILES="*.ttcn *.ttcnpp DNS_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc TCCEncoding.cc UDPasp_PT.cc SS_EncDec.cc MAP_EncDec.cc *.asn"
+FILES="
+	*.asn
+	*.ttcn
+	*.ttcnpp
+	DNS_EncDec.cc
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	MAP_EncDec.cc
+	SS_EncDec.cc
+	TCCConversion.cc
+	TCCEncoding.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	UDPasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_GSUP
+	-DIPA_EMULATION_CTRL
+"

 ../regen-makefile.sh $MAIN $FILES
--- a/lapdm/regen_makefile.sh
+++ b/lapdm/regen_makefile.sh
@ -1,5 +1,14 @@
 #!/bin/sh

-FILES="*.ttcn UD_PT.cc UD_PT.hh RLCMAC_EncDec.cc L1CTL_PortType_CtrlFunctDef.cc"
+FILES="
+	*.ttcn
+	L1CTL_PortType_CtrlFunctDef.cc
+	RLCMAC_EncDec.cc
+	UD_PT.cc
+	UD_PT.hh
+"
+
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh L1CTL_Test.ttcn $FILES
--- a/mgw/regen_makefile.sh
+++ b/mgw/regen_makefile.sh
@ -1,7 +1,28 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc OSMUX_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IP_EncDec.cc StatsD_CodecPort_CtrlFunctdef.cc "
+FILES="
+	*.c
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	IP_EncDec.cc
+	IuUP_EncDec.cc
+	MGCP_CodecPort_CtrlFunctDef.cc
+	Native_FunctionDefs.cc
+	OSMUX_CodecPort_CtrlFunctDef.cc
+	RTP_CodecPort_CtrlFunctDef.cc
+	RTP_EncDec.cc
+	SDP_EncDec.cc
+	StatsD_CodecPort_CtrlFunctdef.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+"

 ../regen-makefile.sh MGCP_Test.ttcn $FILES
--- a/mme/regen_makefile.sh
+++ b/mme/regen_makefile.sh
@ -1,8 +1,28 @@
 #!/bin/sh

-FILES="*.ttcn *.asn *.c IPL4asp_PT.cc  IPL4asp_discovery.cc  Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc  S1AP_CodecPort_CtrlFunctDef.cc  TCCConversion.cc  TCCEncoding.cc TCCInterface.cc  TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc "
+FILES="
+	*.asn
+	*.c
+	*.ttcn
+	DIAMETER_CodecPort_CtrlFunctDef.cc
+	DIAMETER_EncDec.cc
+	GTPC_EncDec.cc
+	GTPU_EncDec.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	LTE_CryptoFunctionDefs.cc
+	Native_FunctionDefs.cc
+	S1AP_CodecPort_CtrlFunctDef.cc
+	S1AP_EncDec.cc
+	SGsAP_CodecPort_CtrlFunctDef.cc
+	TCCConversion.cc
+	TCCEncoding.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3=""
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh MME_Tests.ttcn $FILES

--- a/msc/regen_makefile.sh
+++ b/msc/regen_makefile.sh
@ -1,8 +1,46 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc  SCTPasp_PT.cc  TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc TCCEncoding.cc SGsAP_CodecPort_CtrlFunctDef.cc RANAP_EncDec.cc TCCOpenSecurity.cc *.c *.asn"
+FILES="
+	*.asn
+	*.c
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	MAP_EncDec.cc
+	MGCP_CodecPort_CtrlFunctDef.cc
+	MNCC_EncDec.cc
+	Native_FunctionDefs.cc
+	RANAP_EncDec.cc
+	RTP_CodecPort_CtrlFunctDef.cc
+	RTP_EncDec.cc
+	SCCP_EncDec.cc
+	SCTPasp_PT.cc
+	SDP_EncDec.cc
+	SGsAP_CodecPort_CtrlFunctDef.cc
+	SMPP_CodecPort_CtrlFunctDef.cc
+	SMPP_EncDec.cc
+	SS_EncDec.cc
+	TCCConversion.cc
+	TCCEncoding.cc
+	TCCInterface.cc
+	TCCOpenSecurity.cc
+	TELNETasp_PT.cc
+	UD_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DRAN_EMULATION_RANAP -DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_GSUP
+	-DIPA_EMULATION_MGCP
+	-DIPA_EMULATION_SCCP
+	-DRAN_EMULATION_BSSAP
+	-DRAN_EMULATION_CTRL
+	-DRAN_EMULATION_MGCP
+	-DRAN_EMULATION_RANAP
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh MSC_Tests.ttcn $FILES

--- a/ns/regen_makefile.sh
+++ b/ns/regen_makefile.sh
@ -1,9 +1,26 @@
 #!/bin/bash

-FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc "
+FILES="
+	*.ttcn
+	*.ttcnpp
+	AF_PACKET_PT.cc
+	AF_PACKET_PT.hh
+	BSSGP_EncDec.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	LLC_EncDec.cc
+	Native_FunctionDefs.cc
+	RLCMAC_EncDec.cc
+	StatsD_CodecPort_CtrlFunctdef.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	UD_PT.cc
+"

-FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh "
-
-export CPPFLAGS_TTCN3="-DBSSGP_EM_L3 -DNS_EMULATION_FR"
+export CPPFLAGS_TTCN3="
+	-DBSSGP_EM_L3
+	-DNS_EMULATION_FR
+"

 ../regen-makefile.sh NS_Tests.ttcn $FILES
--- a/pcap-client/regen_makefile.sh
+++ b/pcap-client/regen_makefile.sh
@ -1,11 +1,17 @@
 #!/bin/bash

-FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc OPCAP_CodecPort_CtrlFunctdef.cc "
-#FILES+="*.ttcnpp "
-#FILES+="*.asn"
+FILES="
+	*.ttcn
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	Native_FunctionDefs.cc
+	OPCAP_CodecPort_CtrlFunctdef.cc
+	TCCConversion.cc
+	TCCEncoding.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

 export CPPFLAGS_TTCN3=""

 ../regen-makefile.sh OPCAP_CLIENT_Tests.ttcn $FILES
-
-#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile
--- a/pcu/regen_makefile.sh
+++ b/pcu/regen_makefile.sh
@ -1,7 +1,25 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc"
+FILES="
+	*.ttcn
+	*.ttcnpp
+	BSSGP_EncDec.cc
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	LLC_EncDec.cc
+	Native_FunctionDefs.cc
+	RLCMAC_EncDec.cc
+	StatsD_CodecPort_CtrlFunctdef.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	UD_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DBSSGP_EM_L3"
+export CPPFLAGS_TTCN3="
+	-DBSSGP_EM_L3
+	-DIPA_EMULATION_CTRL
+"

 ../regen-makefile.sh PCU_Tests.ttcn $FILES
--- a/pgw/regen_makefile.sh
+++ b/pgw/regen_makefile.sh
@ -1,7 +1,26 @@
 #!/bin/bash

-FILES="*.ttcn IPL4asp_PT.cc  IPL4asp_discovery.cc  TCCConversion.cc  TCCInterface.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc ICMPv6_EncDec.cc IP_EncDec.cc Native_FunctionDefs.cc UDP_EncDec.cc ICMP_EncDec.cc "
-FILES+="UECUPS_CodecPort_CtrlFunctDef.cc "
-FILES+="DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc "
+FILES="
+	*.ttcn
+	DIAMETER_CodecPort_CtrlFunctDef.cc
+	DIAMETER_EncDec.cc
+	GTPC_EncDec.cc
+	GTPU_EncDec.cc
+	GTP_CodecPort_CtrlFunctDef.cc
+	GTPv2_CodecPort_CtrlFunctDef.cc
+	ICMP_EncDec.cc
+	ICMPv6_EncDec.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	IP_EncDec.cc
+	Native_FunctionDefs.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	UDP_EncDec.cc
+	UECUPS_CodecPort_CtrlFunctDef.cc
+"
+
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh PGW_Tests.ttcn $FILES
--- a/regen-makefile.sh
+++ b/regen-makefile.sh
@ -52,7 +52,8 @@ sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN
 sed -i -e 's/-Wall//' Makefile

 if [ "x$CPPFLAGS_TTCN3" != "x" ]; then
-	sed -i -e 's/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = '"$CPPFLAGS_TTCN3"'/' Makefile
+	CPPFLAGS_TTCN3="$(echo "$CPPFLAGS_TTCN3" | tr -d '\n' | tr '\t' ' ')"
+	sed -i -e "s/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = $CPPFLAGS_TTCN3/" Makefile
 fi

 # for TITAN 6.3.0
--- a/remsim/regen_makefile.sh
+++ b/remsim/regen_makefile.sh
@ -1,8 +1,29 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp *.asn IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc Native_FunctionDefs.cc RSPRO_EncDec.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc PIPEasp_PT.cc "
+FILES="
+	*.asn
+	*.ttcn
+	*.ttcnpp
+	Abstract_Socket.cc
+	HTTPmsg_MessageLen_Function.cc
+	HTTPmsg_PT.cc
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	JSON_EncDec.cc
+	Native_FunctionDefs.cc
+	PIPEasp_PT.cc
+	RSPRO_EncDec.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	VPCD_CodecPort_CtrlFunctDef.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSPRO -DIPA_EMULATION_CTRL"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_RSPRO
+	-DIPA_EMULATION_CTRL
+"

 ../regen-makefile.sh REMSIM_Tests.ttcn $FILES

--- a/sccp/regen_makefile.sh
+++ b/sccp/regen_makefile.sh
@ -1,7 +1,25 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc  SCTPasp_PT.cc  TCCConversion.cc TCCInterface.cc UD_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc IPA_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc TCCEncoding.cc "
+FILES="
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	Native_FunctionDefs.cc
+	SCCP_EncDec.cc
+	SCTPasp_PT.cc
+	TCCConversion.cc
+	TCCEncoding.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	UD_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_SCCP
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh SCCP_Tests.ttcn $FILES
--- a/selftest/regen_makefile.sh
+++ b/selftest/regen_makefile.sh
@ -2,8 +2,20 @@

 MAIN=Selftest.ttcn

-FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc"
+FILES="
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	TCCConversion.cc
+	TCCInterface.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_RSL
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh $MAIN $FILES
--- a/sgsn/regen_makefile.sh
+++ b/sgsn/regen_makefile.sh
@ -1,8 +1,34 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp *.asn BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc  SCTPasp_PT.cc RANAP_EncDec.cc "
+FILES="
+	*.asn
+	*.ttcn
+	*.ttcnpp
+	BSSGP_EncDec.cc
+	GTPC_EncDec.cc
+	GTPU_EncDec.cc
+	GTP_CodecPort_CtrlFunctDef.cc
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	LLC_EncDec.cc
+	Native_FunctionDefs.cc
+	RANAP_EncDec.cc
+	RLCMAC_EncDec.cc
+	SCCP_EncDec.cc
+	SCTPasp_PT.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DRAN_EMULATION_RANAP -DBSSGP_EM_L3"
+export CPPFLAGS_TTCN3="
+	-DBSSGP_EM_L3
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_GSUP
+	-DRAN_EMULATION_RANAP
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh SGSN_Tests.ttcn $FILES

--- a/simtrace/regen_makefile.sh
+++ b/simtrace/regen_makefile.sh
@ -1,6 +1,13 @@
 #!/bin/sh

-FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc "
+FILES="
+	*.ttcn
+	Native_FunctionDefs.cc
+	USB_PT.cc
+"
+
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh SIMTRACE_Tests.ttcn $FILES

--- a/sip/regen_makefile.sh
+++ b/sip/regen_makefile.sh
@ -1,8 +1,27 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc
-IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SIPmsg_PT.cc *.c "
+FILES="
+	*.c
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	MNCC_EncDec.cc
+	Native_FunctionDefs.cc
+	RTP_CodecPort_CtrlFunctDef.cc
+	RTP_EncDec.cc
+	SDP_EncDec.cc
+	SIPmsg_PT.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+	UD_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DRAN_EMULATION_CTRL"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DRAN_EMULATION_CTRL
+"

 ../regen-makefile.sh SIP_Tests.ttcn $FILES
--- a/smlc/regen_makefile.sh
+++ b/smlc/regen_makefile.sh
@ -2,8 +2,34 @@

 MAIN=SMLC_Tests.ttcn

-FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc *.c"
+FILES="
+	*.c
+	*.ttcn
+	*.ttcnpp
+	IPA_CodecPort_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	IuUP_EncDec.cc
+	MGCP_CodecPort_CtrlFunctDef.cc
+	Native_FunctionDefs.cc
+	RTP_CodecPort_CtrlFunctDef.cc
+	RTP_EncDec.cc
+	SCTPasp_PT.cc
+	SDP_EncDec.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_RSL
+	-DIPA_EMULATION_MGCP
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_SCCP
+	-DRAN_EMULATION_BSSAP
+	-DRAN_EMULATION_MGCP
+	-DRAN_EMULATION_CTRL
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh $MAIN $FILES
--- a/stp/regen_makefile.sh
+++ b/stp/regen_makefile.sh
@ -1,7 +1,25 @@
 #!/bin/sh

-FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc  TCCInterface.cc IPL4asp_PT.cc IPL4asp_discovery.cc IPA_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc TCCEncoding.cc M3UA_CodecPort_CtrlFunctDef.cc "
+FILES="
+	*.ttcn
+	*.ttcnpp
+	SCCP_EncDec.cc
+	SCTPasp_PT.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	IPA_CodecPort_CtrlFunctDef.cc
+	TELNETasp_PT.cc
+	Native_FunctionDefs.cc
+	TCCEncoding.cc
+	M3UA_CodecPort_CtrlFunctDef.cc
+"

-export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="
+	-DIPA_EMULATION_CTRL
+	-DIPA_EMULATION_SCCP
+	-DUSE_MTP3_DISTRIBUTOR
+"

 ../regen-makefile.sh STP_Tests.ttcn $FILES
--- a/sysinfo/regen_makefile.sh
+++ b/sysinfo/regen_makefile.sh
@ -1,5 +1,16 @@
 #!/bin/sh

-FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc IPL4_GSMTAP_CtrlFunctDef.cc TELNETasp_PT.cc"
+FILES="
+	*.ttcn
+	IPL4_GSMTAP_CtrlFunctDef.cc
+	IPL4asp_PT.cc
+	IPL4asp_discovery.cc
+	TCCConversion.cc
+	TCCInterface.cc
+	TELNETasp_PT.cc
+"
+
+export CPPFLAGS_TTCN3="
+"

 ../regen-makefile.sh Test.ttcn $FILES