From 95ffdaadbdcbb703cb393b94374e1e70b8cab5e9 Mon Sep 17 00:00:00 2001
From: balaskoa <Jeno.Balasko@ericsson.com>
Date: Tue, 3 Nov 2020 13:26:21 +0100
Subject: [PATCH] e2c migration update in licensegen 2.
Signed-off-by: balaskoa <Jeno.Balasko@ericsson.com>
Change-Id: I64b88ce20bb1ca8860ba50a3806882e3b002ad14
---
licensegen/Makefile | 13 +++++++++----
licensegen/Makefile_renew_license | 5 +++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/licensegen/Makefile b/licensegen/Makefile
index b447b98b0..c5ddaa2ff 100644
--- a/licensegen/Makefile
+++ b/licensegen/Makefile
@@ -15,16 +15,21 @@
##############################################################################
# Makefile for the license generator program
+TOP := ..
include ../Makefile.cfg
-MYSQL_DIR := /mnt/TTCN/Tools/mysql-5.0.41-solaris8-sparc
-TARGET_DIR := /mnt/TTCN/license
+
+#valid on on $TITAN7, RHEL7 :
+MYSQL_DIR := /app/vbuild/RHEL7-x86_64/mysql/5.5.30/
+#valid on on $TITAN7, RHEL7 :
+OPENSSL_DIR := /local/home/titanrt/tools/openssl
+TARGET_DIR := /proj/ttcn3titan/license
CPPFLAGS += -I$(OPENSSL_DIR)/include -I$(MYSQL_DIR)/include
SOLARIS_LIBS := -lsocket -lnsl -lm -lz
SOLARIS8_LIBS := -lsocket -lnsl -lm -lz
-LINUX_LIBS :=
+LINUX_LIBS := -lpthread -lz -lm -lrt -ldl #-lnsl
FREEBSD_LIBS :=
WIN32_LIBS :=
@@ -35,7 +40,7 @@ OBJECTS := $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SOURCES))) $(COMMON_OBJECTS)
TARGETS := license_gen$(EXESUFFIX)
license_gen$(EXESUFFIX): $(OBJECTS)
- $(CC) -o $@ $(OBJECTS) $(MYSQL_DIR)/lib/libmysqlclient.a \
+ $(CC) -o $@ $(OBJECTS) -L$(MYSQL_DIR)/lib -lmysqlclient \
$(OPENSSL_DIR)/lib/libcrypto.a $($(PLATFORM)_LIBS)
chmod g+w $(TARGETS)
diff --git a/licensegen/Makefile_renew_license b/licensegen/Makefile_renew_license
index 2cafb9b72..7be4b22b1 100644
--- a/licensegen/Makefile_renew_license
+++ b/licensegen/Makefile_renew_license
@@ -10,9 +10,10 @@
# Gecse, Roland
#
##############################################################################
-GCC_DIR=/mnt/TTCN/Tools/gcc-4.1.1-sol8
+GCC_DIR=/usr/
CGIC_DIR=/mnt/TTCN/Tools/cgic205-gcc3.0.4-sol8
-MYSQL_DIR=/mnt/TTCN/Tools/mysql-standard-4.1.22-sun-solaris2.8-sparc
+#valid on on $TITAN7, RHEL7 :
+MYSQL_DIR := /app/vbuild/RHEL7-x86_64/mysql/5.5.30/
CC=${GCC_DIR}/bin/gcc
--
GitLab