diff --git a/bin/Makefile b/bin/Makefile index 120c4ec45..ca547bb63 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,8 +1,8 @@ # This Makefile was generated by the Makefile Generator # of the TTCN-3 Test Executor version CRL 113 200/6 R1A -# for Elemer Lelik (ethlel@esekilxxen1846) on Wed Apr 12 09:00:44 2017 +# for Harald Welte (laforge@nataraja) on Wed Apr 12 11:16:09 2017 -# Copyright (c) 2000-2017 Ericsson Telecom AB +# Copyright (c) 2000-2016 Ericsson Telecom AB # The following make commands are available: # - make, make all Builds the executable test suite. @@ -21,7 +21,9 @@ # The path of your TTCN-3 Test Executor installation: # Uncomment this line to override the environment variable. -# TTCN3_DIR = +# The value below points to the location of the TITAN version +# that generated this makefile. +TTCN3_DIR = /usr # Your platform: (SOLARIS, SOLARIS8, LINUX, FREEBSD or WIN32) PLATFORM = LINUX @@ -31,13 +33,13 @@ PLATFORM = LINUX CXX = g++ # Flags for the C++ preprocessor (and makedepend as well): -CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)/include +CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)/include/titan # Flags for the C++ compiler: CXXFLAGS = -Wall # Flags for the linker: -LDFLAGS = +LDFLAGS = -L$(TTCN3_DIR)/lib/titan ifeq ($(PLATFORM), WIN32) # Silence linker warnings. @@ -54,10 +56,6 @@ COMPILER_FLAGS = -L # Execution mode: (either ttcn3 or ttcn3-parallel) TTCN3_LIB = ttcn3-parallel -# The path of your OpenSSL installation: -# If you do not have your own one, leave it unchanged. -OPENSSL_DIR = $(TTCN3_DIR) - # The path of your libxml2 installation: # If you do not have your own one, leave it unchanged. XMLDIR = $(TTCN3_DIR) @@ -110,9 +108,9 @@ TARGET = $(EXECUTABLE) # Do not modify these unless you know what you are doing... # Platform specific additional libraries: # -SOLARIS_LIBS = -lsocket -lnsl -lxml2 -lresolv -SOLARIS8_LIBS = -lsocket -lnsl -lxml2 -lresolv -LINUX_LIBS = -lxml2 -lpthread -lrt +SOLARIS_LIBS = -lsocket -lnsl -lxml2 +SOLARIS8_LIBS = -lsocket -lnsl -lxml2 +LINUX_LIBS = -lxml2 FREEBSD_LIBS = -lxml2 WIN32_LIBS = -lxml2