[M] Change in osmo-ttcn3-hacks[master]: buildsystem/regen_makefile: change to inc script

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40027?usp=email )

Change subject: buildsystem/regen_makefile: change to inc script ......................................................................

buildsystem/regen_makefile: change to inc script

Make the regen_makefile script more consistent with gen_links.inc.sh by also turning it into an include script. By doing this all previously declared variables are available in regen_makefile, which means export and passing as arguments is not needed anymore, making the resulting users simpler.

Use #!/bin/sh -e while at it and remove empty CPPFLAGS_TTCN3 vars.

Change-Id: I10a41671e857024be6a5e8577c2aaca83228793e --- M SCCP_Test/regen_makefile.sh R _buildsystem/regen_makefile.inc.sh M asterisk/regen_makefile.sh M bsc-nat/regen_makefile.sh M bsc/regen_makefile.sh M bts/regen_makefile.sh M cbc/regen_makefile.sh M ccid/regen_makefile.sh M dia2gsup/regen_makefile.sh M eim/regen_makefile.sh M epdg/regen_makefile.sh M fr-net/regen_makefile.sh M fr/regen_makefile.sh M gbproxy/regen_makefile.sh M ggsn_tests/regen_makefile.sh M hlr/regen_makefile.sh M hnbgw/regen_makefile.sh M hnodeb/regen_makefile.sh M hss/regen_makefile.sh M ipad/regen_makefile.sh M mgw/regen_makefile.sh M mme/regen_makefile.sh M msc/regen_makefile.sh M ns/regen_makefile.sh M pcap-client/regen_makefile.sh M pcrf/regen_makefile.sh M pcu/regen_makefile.sh M pgw/regen_makefile.sh M remsim/regen_makefile.sh M s1gw/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh M sgsn/regen_makefile.sh M simtrace/regen_makefile.sh M sip/regen_makefile.sh M smlc/regen_makefile.sh M stp/regen_makefile.sh M sysinfo/regen_makefile.sh M upf/regen_makefile.sh 39 files changed, 110 insertions(+), 139 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved

diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh index fd6a08c..08533dd 100755 --- a/SCCP_Test/regen_makefile.sh +++ b/SCCP_Test/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=SCCP_Testcases

@@ -7,7 +7,4 @@ *.ttcnpp "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/_buildsystem/regen-makefile.sh b/_buildsystem/regen_makefile.inc.sh old mode 100755 new mode 100644 similarity index 93% rename from _buildsystem/regen-makefile.sh rename to _buildsystem/regen_makefile.inc.sh index 813b212..573231f --- a/_buildsystem/regen-makefile.sh +++ b/_buildsystem/regen_makefile.inc.sh @@ -1,5 +1,3 @@ -#!/bin/sh - # Copyright 2017-2019 Harald Welte # Copyright 2018 sysmocom - s.f.m.c. GmbH # @@ -25,6 +23,16 @@ # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. #

+if [ -z "$NAME" ]; then + echo "ERROR: NAME is not set!" + exit 1 +fi + +if [ -z "$FILES" ]; then + echo "ERROR: FILES is not set!" + exit 1 +fi + test -x "$(which ttcn3_makefilegen 2>/dev/null)" || { echo "ERROR: ttcn3_makefilegen not in PATH"; exit 1; }

# Enable ccache if it can be found in path. @@ -37,7 +45,7 @@ USE_CCACHE=1 fi

-ttcn3_makefilegen -g -p -l -U 8 -f $* +ttcn3_makefilegen -g -p -l -U 8 -f -e "$NAME" $FILES

sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = /usr/' Makefile sed -i -e 's/LDFLAGS = /LDFLAGS = -L /usr/lib/titan/' Makefile diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh index e3dfb24..d5d0c5b 100755 --- a/asterisk/regen_makefile.sh +++ b/asterisk/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=Asterisk_Tests

@@ -21,7 +21,7 @@ TELNETasp_PT.cc "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

# required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index 5b3fe4e..c6523aa 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=BSCNAT_Tests

@@ -19,7 +19,7 @@ TELNETasp_PT.cc "

-export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_MGCP -DIPA_EMULATION_SCCP @@ -29,4 +29,4 @@ -DUSE_MTP3_DISTRIBUTOR "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index 7ef23c3..32e0b71 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=BSC_Tests

@@ -23,7 +23,7 @@ TELNETasp_PT.cc "

-export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_MGCP -DIPA_EMULATION_RSL @@ -36,4 +36,4 @@ -DUSE_MTP3_DISTRIBUTOR "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh index 4f2cbeb..c9b345e 100755 --- a/bts/regen_makefile.sh +++ b/bts/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=BTS_Tests

@@ -22,11 +22,11 @@ UD_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index eba6a56..8ec5fcb 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=CBC_Tests

@@ -24,9 +24,6 @@ TELNETasp_PT.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh index b618faf..91e607e 100755 --- a/ccid/regen_makefile.sh +++ b/ccid/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=CCID_Tests

@@ -9,10 +9,7 @@ USB_PT.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/dia2gsup/regen_makefile.sh b/dia2gsup/regen_makefile.sh index b248f79..01aea4c 100755 --- a/dia2gsup/regen_makefile.sh +++ b/dia2gsup/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=DIA2GSUP_Tests

@@ -17,9 +17,9 @@ DIAMETER_CodecPort_CtrlFunctDef.cc "

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

-../_buildsystem/regen-makefile.sh DIA2GSUP_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/eim/regen_makefile.sh b/eim/regen_makefile.sh index 5217eae..2b5cb24 100755 --- a/eim/regen_makefile.sh +++ b/eim/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=eIM_Tests

@@ -19,7 +19,7 @@ PKIX1Implicit88_EncDec.cc PIPEasp_PT.cc " -../_buildsystem/regen-makefile.sh eIM_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh

# required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/epdg/regen_makefile.sh b/epdg/regen_makefile.sh index 836a10f..847c412 100755 --- a/epdg/regen_makefile.sh +++ b/epdg/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=EPDG_Tests

@@ -23,9 +23,9 @@ GTPv2_CodecPort_CtrlFunctDef.cc "

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

-../_buildsystem/regen-makefile.sh EPDG_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh index 8500a8a..a403bf2 100755 --- a/fr-net/regen_makefile.sh +++ b/fr-net/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=FRNET_Tests

@@ -16,8 +16,8 @@ TELNETasp_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh index c4ce404..867fc7c 100755 --- a/fr/regen_makefile.sh +++ b/fr/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=FR_Tests

@@ -17,8 +17,8 @@ TELNETasp_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index a03404b..421a8f4 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=GBProxy_Tests

@@ -24,13 +24,13 @@ TELNETasp_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -i 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 5fb7718..f1bccb7 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=GGSN_Tests

@@ -24,7 +24,4 @@ UDP_EncDec.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 02909f8..721599c 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=HLR_Tests

@@ -20,9 +20,9 @@ UDPasp_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/hnbgw/regen_makefile.sh b/hnbgw/regen_makefile.sh index c9ce26d..8e4b9d9 100755 --- a/hnbgw/regen_makefile.sh +++ b/hnbgw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=HNBGW_Tests

@@ -30,13 +30,13 @@ PFCP_CodecPort_CtrlFunctDef.cc "

-export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DRAN_EMULATION_RANAP -DSTATSD_HAVE_VTY -DUSE_MTP3_DISTRIBUTOR "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh index 4cb568a..6505cf6 100755 --- a/hnodeb/regen_makefile.sh +++ b/hnodeb/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=HNB_Tests

@@ -31,11 +31,11 @@ GTPv1U_CodecPort_CtrlFunctDef.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/hss/regen_makefile.sh b/hss/regen_makefile.sh index 97aa898..49be80a 100755 --- a/hss/regen_makefile.sh +++ b/hss/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=HSS_Tests

@@ -17,7 +17,4 @@ TCCInterface.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/ipad/regen_makefile.sh b/ipad/regen_makefile.sh index f1a7f99..6aab793 100755 --- a/ipad/regen_makefile.sh +++ b/ipad/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=IPAd_Tests

@@ -19,7 +19,7 @@ PKIX1Implicit88_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc " -../_buildsystem/regen-makefile.sh IPAd_Tests.ttcn $FILES +. ../_buildsystem/regen_makefile.inc.sh

# required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh index a3d4a74..6d05166 100755 --- a/mgw/regen_makefile.sh +++ b/mgw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=MGCP_Test

@@ -23,9 +23,9 @@ TELNETasp_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 690020b..768fbd2 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=MME_Tests

@@ -28,10 +28,6 @@ UECUPS_CodecPort_CtrlFunctDef.cc "

- -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 3aa3515..b254f9d 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=MSC_Tests

@@ -32,7 +32,7 @@ UD_PT.cc "

-export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP -DIPA_EMULATION_MGCP @@ -44,6 +44,6 @@ -DUSE_MTP3_DISTRIBUTOR "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lssl/' Makefile diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index f778317..10f96e2 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=NS_Tests

@@ -19,10 +19,10 @@ UD_PT.cc "

-export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DNS_EMULATION_FR -DSTATSD_HAVE_VTY "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh index d3e7b2c..752e74f 100755 --- a/pcap-client/regen_makefile.sh +++ b/pcap-client/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=OPCAP_CLIENT_Tests

@@ -14,6 +14,4 @@ TELNETasp_PT.cc "

-export CPPFLAGS_TTCN3="" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pcrf/regen_makefile.sh b/pcrf/regen_makefile.sh index 3883291..e0bf1a4 100755 --- a/pcrf/regen_makefile.sh +++ b/pcrf/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=PCRF_Tests

@@ -17,7 +17,4 @@ TCCInterface.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index 1237c03..1aaabb2 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=PCU_Tests

@@ -19,10 +19,10 @@ UD_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index b6b7f66..ec40716 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e

NAME=PGW_Tests

@@ -25,7 +25,4 @@ UECUPS_CodecPort_CtrlFunctDef.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh index d08dbdc..9d4df3e 100755 --- a/remsim/regen_makefile.sh +++ b/remsim/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=REMSIM_Tests

@@ -22,12 +22,12 @@ VPCD_CodecPort_CtrlFunctDef.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

# required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/s1gw/regen_makefile.sh b/s1gw/regen_makefile.sh index 173a7a1..3c48af2 100755 --- a/s1gw/regen_makefile.sh +++ b/s1gw/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=S1GW_Tests

@@ -18,11 +18,7 @@ TCCInterface.cc "

- -export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh index 397a210..55d8826 100755 --- a/sccp/regen_makefile.sh +++ b/sccp/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=SCCP_Tests

@@ -18,10 +18,10 @@ UD_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index b3a725d..9283624 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=Selftest

@@ -13,10 +13,10 @@ TCCInterface.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index a378773..c116d94 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=SGSN_Tests

@@ -24,7 +24,7 @@ TELNETasp_PT.cc "

-export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP @@ -32,6 +32,6 @@ -DUSE_MTP3_DISTRIBUTOR "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh index 0080e70..f63ac91 100755 --- a/simtrace/regen_makefile.sh +++ b/simtrace/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=SIMTRACE_Tests

@@ -9,10 +9,7 @@ USB_PT.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh

#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh index 09618b5..f18d70b 100755 --- a/sip/regen_makefile.sh +++ b/sip/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=SIP_Tests

@@ -23,9 +23,9 @@ UD_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index 279ff76..ed37dac 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=SMLC_Tests

@@ -21,7 +21,7 @@ TELNETasp_PT.cc "

-export CPPFLAGS_TTCN3=" +CPPFLAGS_TTCN3=" -DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL @@ -32,4 +32,4 @@ -DUSE_MTP3_DISTRIBUTOR "

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh index b2c2d3c..0d7fa48 100755 --- a/stp/regen_makefile.sh +++ b/stp/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=STP_Tests

@@ -18,10 +18,10 @@ M3UA_CodecPort_CtrlFunctDef.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh index 6bd42c5..4076c52 100755 --- a/sysinfo/regen_makefile.sh +++ b/sysinfo/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=Test

@@ -13,7 +13,4 @@ TELNETasp_PT.cc "

-export CPPFLAGS_TTCN3=" -" - -../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh diff --git a/upf/regen_makefile.sh b/upf/regen_makefile.sh index c704184..d835449 100755 --- a/upf/regen_makefile.sh +++ b/upf/regen_makefile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e

NAME=UPF_Tests

@@ -17,9 +17,9 @@ TELNETasp_PT.cc "

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

-../_buildsystem/regen-makefile.sh -e $NAME $FILES +. ../_buildsystem/regen_makefile.inc.sh