summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2021-10-12 13:05:42 +0200
committerOliver Smith <osmith@sysmocom.de>2021-10-13 11:12:22 +0200
commitf8fe1329e2cb3e39e9d1721ce0a74e3a1843c4e9 (patch)
tree0078d9b53e43d160acdaf109c206e4aedfeb68bf
parentf92ccad16bb0f3d0fe5cdd325d57204ba1dc36d4 (diff)
regen_makefile.sh: set executable name explicitly
Set the executable name in each regen_makefile.sh explicitly with -e, instead of having it set indirectly from the first .ttcn file. Make it consistent by placing the name on top of each of these files. Fix for warning: ttcn3_makefilegen: warning: File `BSC_Tests.ttcn' was given more than once for the Makefile. Related: OS#5252 Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f
-rwxr-xr-xSCCP_Test/regen_makefile.sh4
-rwxr-xr-xbsc-nat/regen_makefile.sh4
-rwxr-xr-xbsc/regen_makefile.sh4
-rwxr-xr-xbts/regen_makefile.sh4
-rwxr-xr-xcbc/regen_makefile.sh4
-rwxr-xr-xccid/regen_makefile.sh4
-rwxr-xr-xfr-net/regen_makefile.sh4
-rwxr-xr-xfr/regen_makefile.sh4
-rwxr-xr-xgbproxy/regen_makefile.sh4
-rwxr-xr-xggsn_tests/regen_makefile.sh4
-rwxr-xr-xhlr/regen_makefile.sh4
-rwxr-xr-xlapdm/regen_makefile.sh4
-rwxr-xr-xmgw/regen_makefile.sh4
-rwxr-xr-xmme/regen_makefile.sh4
-rwxr-xr-xmsc/regen_makefile.sh4
-rwxr-xr-xns/regen_makefile.sh4
-rwxr-xr-xpcap-client/regen_makefile.sh4
-rwxr-xr-xpcu/regen_makefile.sh4
-rwxr-xr-xpgw/regen_makefile.sh4
-rwxr-xr-xremsim/regen_makefile.sh4
-rwxr-xr-xsccp/regen_makefile.sh4
-rwxr-xr-xselftest/regen_makefile.sh4
-rwxr-xr-xsgsn/regen_makefile.sh4
-rwxr-xr-xsimtrace/regen_makefile.sh4
-rwxr-xr-xsip/regen_makefile.sh4
-rwxr-xr-xsmlc/regen_makefile.sh4
-rwxr-xr-xstp/regen_makefile.sh4
-rwxr-xr-xsysinfo/regen_makefile.sh4
28 files changed, 78 insertions, 34 deletions
diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh
index f5d13b72..ee2cdb39 100755
--- a/SCCP_Test/regen_makefile.sh
+++ b/SCCP_Test/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-MAIN=SCCP_Testcases.ttcn
+NAME=SCCP_Testcases
FILES="
*.ttcn
@@ -10,4 +10,4 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh
index 33b557c3..470d1090 100755
--- a/bsc-nat/regen_makefile.sh
+++ b/bsc-nat/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-MAIN=BSCNAT_Tests.ttcn
+NAME=BSCNAT_Tests
FILES="
*.c
@@ -29,4 +29,4 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh
index 53f8e826..9e69befa 100755
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-MAIN=BSC_Tests.ttcn
+NAME=BSC_Tests
FILES="
*.c
@@ -34,4 +34,4 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh
index 850e0bf4..147d64fe 100755
--- a/bts/regen_makefile.sh
+++ b/bts/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=BTS_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -26,4 +28,4 @@ export CPPFLAGS_TTCN3="
-DIPA_EMULATION_RSL
"
-../regen-makefile.sh BTS_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh
index d2c3b128..11a93c46 100755
--- a/cbc/regen_makefile.sh
+++ b/cbc/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+NAME=CBC_Tests
+
FILES="
*.asn
*.ttcn
@@ -23,6 +25,6 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh CBC_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
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 09256541..bbb7f33b 100755
--- a/ccid/regen_makefile.sh
+++ b/ccid/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=CCID_Tests
+
FILES="
*.ttcn
Native_FunctionDefs.cc
@@ -9,7 +11,7 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh CCID_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
#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/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh
index 6488015f..89eccd33 100755
--- a/fr-net/regen_makefile.sh
+++ b/fr-net/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+NAME=FRNET_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -18,4 +20,4 @@ export CPPFLAGS_TTCN3="
-DNS_EMULATION_FR
"
-../regen-makefile.sh FRNET_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh
index 9c473ef0..1b37cb68 100755
--- a/fr/regen_makefile.sh
+++ b/fr/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+NAME=FR_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -19,4 +21,4 @@ export CPPFLAGS_TTCN3="
-DNS_EMULATION_FR
"
-../regen-makefile.sh FR_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh
index 5ec66896..78910a4c 100755
--- a/gbproxy/regen_makefile.sh
+++ b/gbproxy/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+NAME=GBProxy_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -30,6 +32,6 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh GBProxy_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
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 5e6b08d7..7adbd0b5 100755
--- a/ggsn_tests/regen_makefile.sh
+++ b/ggsn_tests/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=GGSN_Tests
+
FILES="
*.ttcn
BSSGP_EncDec.cc
@@ -21,4 +23,4 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh GGSN_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh
index 9ab40cef..7cd6cf4d 100755
--- a/hlr/regen_makefile.sh
+++ b/hlr/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-MAIN="HLR_Tests.ttcn"
+NAME=HLR_Tests
FILES="
*.asn
@@ -24,4 +24,4 @@ export CPPFLAGS_TTCN3="
-DIPA_EMULATION_CTRL
"
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh
index 2eb1366d..f354e873 100755
--- a/lapdm/regen_makefile.sh
+++ b/lapdm/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=L1CTL_Test
+
FILES="
*.ttcn
L1CTL_PortType_CtrlFunctDef.cc
@@ -11,4 +13,4 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh L1CTL_Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh
index a47f7baf..921956ca 100755
--- a/mgw/regen_makefile.sh
+++ b/mgw/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=MGCP_Test
+
FILES="
*.c
*.ttcn
@@ -25,4 +27,4 @@ export CPPFLAGS_TTCN3="
-DIPA_EMULATION_CTRL
"
-../regen-makefile.sh MGCP_Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh
index 56068790..62956d8a 100755
--- a/mme/regen_makefile.sh
+++ b/mme/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=MME_Tests
+
FILES="
*.asn
*.c
@@ -24,6 +26,6 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh MME_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
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 4ca95588..081d2cba 100755
--- a/msc/regen_makefile.sh
+++ b/msc/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=MSC_Tests
+
FILES="
*.asn
*.c
@@ -42,6 +44,6 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh MSC_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
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 1958dee7..88360d89 100755
--- a/ns/regen_makefile.sh
+++ b/ns/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+NAME=NS_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -23,4 +25,4 @@ export CPPFLAGS_TTCN3="
-DNS_EMULATION_FR
"
-../regen-makefile.sh NS_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh
index 88c062d5..81dd1eb7 100755
--- a/pcap-client/regen_makefile.sh
+++ b/pcap-client/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+NAME=OPCAP_CLIENT_Tests
+
FILES="
*.ttcn
IPL4asp_PT.cc
@@ -14,4 +16,4 @@ FILES="
export CPPFLAGS_TTCN3=""
-../regen-makefile.sh OPCAP_CLIENT_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh
index d4404d03..006c6baa 100755
--- a/pcu/regen_makefile.sh
+++ b/pcu/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=PCU_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -22,4 +24,4 @@ export CPPFLAGS_TTCN3="
-DIPA_EMULATION_CTRL
"
-../regen-makefile.sh PCU_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh
index 21f03ba1..ce59dfb7 100755
--- a/pgw/regen_makefile.sh
+++ b/pgw/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+NAME=PGW_Tests
+
FILES="
*.ttcn
BSSGP_EncDec.cc
@@ -24,4 +26,4 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh PGW_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh
index edfb0733..fb04cce8 100755
--- a/remsim/regen_makefile.sh
+++ b/remsim/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=REMSIM_Tests
+
FILES="
*.asn
*.ttcn
@@ -25,7 +27,7 @@ export CPPFLAGS_TTCN3="
-DIPA_EMULATION_CTRL
"
-../regen-makefile.sh REMSIM_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
# required for forkpty(3) used by PIPEasp
sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile
diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh
index 175c10b3..7cd809d1 100755
--- a/sccp/regen_makefile.sh
+++ b/sccp/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=SCCP_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -22,4 +24,4 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh SCCP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh
index 17854ce3..383e2db7 100755
--- a/selftest/regen_makefile.sh
+++ b/selftest/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-MAIN=Selftest.ttcn
+NAME=Selftest
FILES="
*.ttcn
@@ -19,4 +19,4 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh
index 2a5cb922..a1f702a3 100755
--- a/sgsn/regen_makefile.sh
+++ b/sgsn/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=SGSN_Tests
+
FILES="
*.asn
*.ttcn
@@ -30,6 +32,6 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh SGSN_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
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 509699e9..baecf7de 100755
--- a/simtrace/regen_makefile.sh
+++ b/simtrace/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=SIMTRACE_Tests
+
FILES="
*.ttcn
Native_FunctionDefs.cc
@@ -9,7 +11,7 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh SIMTRACE_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
#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 caf657c7..c7a645da 100755
--- a/sip/regen_makefile.sh
+++ b/sip/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=SIP_Tests
+
FILES="
*.c
*.ttcn
@@ -24,4 +26,4 @@ export CPPFLAGS_TTCN3="
-DRAN_EMULATION_CTRL
"
-../regen-makefile.sh SIP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh
index 24e3407b..180486c0 100755
--- a/smlc/regen_makefile.sh
+++ b/smlc/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-MAIN=SMLC_Tests.ttcn
+NAME=SMLC_Tests
FILES="
*.c
@@ -32,4 +32,4 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh
index 0b90687b..032be0d0 100755
--- a/stp/regen_makefile.sh
+++ b/stp/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=STP_Tests
+
FILES="
*.ttcn
*.ttcnpp
@@ -22,4 +24,4 @@ export CPPFLAGS_TTCN3="
-DUSE_MTP3_DISTRIBUTOR
"
-../regen-makefile.sh STP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh
index 4a3dfcc5..569f4069 100755
--- a/sysinfo/regen_makefile.sh
+++ b/sysinfo/regen_makefile.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+NAME=Test
+
FILES="
*.ttcn
IPL4_GSMTAP_CtrlFunctDef.cc
@@ -13,4 +15,4 @@ FILES="
export CPPFLAGS_TTCN3="
"
-../regen-makefile.sh Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES