diff options
Diffstat (limited to 'regen-makefile.sh')
| -rwxr-xr-x | regen-makefile.sh | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/regen-makefile.sh b/regen-makefile.sh index 086c1247..813b212e 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -24,9 +24,6 @@ # # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. # -# The regexes below patch the generated Makefile to work on Debian 9 and -# unstable, so far tested with TITAN 6.1.0, 6.2.0 and 6.3.0 -# test -x "$(which ttcn3_makefilegen 2>/dev/null)" || { echo "ERROR: ttcn3_makefilegen not in PATH"; exit 1; } @@ -40,28 +37,23 @@ if [ -z "$USE_CCACHE" ] && which ccache 2>/dev/null; then USE_CCACHE=1 fi -ttcn3_makefilegen -g -p -l -U 5 -f $* - -TITAN_VERSION=$(ttcn3_makefilegen -v 2>&1 |grep "Product number" |cut --delimiter="/" -f 2-| sed -e "s/[A-Z ]//g") +ttcn3_makefilegen -g -p -l -U 8 -f $* sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile -sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile +sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp -lssl/' Makefile #sed -i -e 's/TTCN3_LIB = ttcn3-parallel/TTCN3_LIB = ttcn3/' Makefile # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details -if [ $(($TITAN_VERSION >= 65)) = 1 ]; then - sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED/' Makefile -else - sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile -fi +sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED -DAS_USE_SSL/' Makefile #remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs 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 |