Browse Source

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
changes/58/25758/2
Oliver Smith 10 months ago
parent
commit
f8fe1329e2
  1. 4
      SCCP_Test/regen_makefile.sh
  2. 4
      bsc-nat/regen_makefile.sh
  3. 4
      bsc/regen_makefile.sh
  4. 4
      bts/regen_makefile.sh
  5. 4
      cbc/regen_makefile.sh
  6. 4
      ccid/regen_makefile.sh
  7. 4
      fr-net/regen_makefile.sh
  8. 4
      fr/regen_makefile.sh
  9. 4
      gbproxy/regen_makefile.sh
  10. 4
      ggsn_tests/regen_makefile.sh
  11. 4
      hlr/regen_makefile.sh
  12. 4
      lapdm/regen_makefile.sh
  13. 4
      mgw/regen_makefile.sh
  14. 4
      mme/regen_makefile.sh
  15. 4
      msc/regen_makefile.sh
  16. 4
      ns/regen_makefile.sh
  17. 4
      pcap-client/regen_makefile.sh
  18. 4
      pcu/regen_makefile.sh
  19. 4
      pgw/regen_makefile.sh
  20. 4
      remsim/regen_makefile.sh
  21. 4
      sccp/regen_makefile.sh
  22. 4
      selftest/regen_makefile.sh
  23. 4
      sgsn/regen_makefile.sh
  24. 4
      simtrace/regen_makefile.sh
  25. 4
      sip/regen_makefile.sh
  26. 4
      smlc/regen_makefile.sh
  27. 4
      stp/regen_makefile.sh
  28. 4
      sysinfo/regen_makefile.sh

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

4
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

Loading…
Cancel
Save