openssl include changed

[deliverable/titan.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 74fc88d40a6c13519d01eb1c221102a52290f7a6..bc81ca306bac3bd4ddcea476b229e65b484bbcaf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,32 @@
-###############################################################################
-# Copyright (c) 2000-2015 Ericsson Telecom AB
+##############################################################################
+# Copyright (c) 2000-2016 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
+#
+# Contributors:
+#   
+#   Baji, Laszlo
+#   Balasko, Jeno
+#   Delic, Adam
+#   Forstner, Matyas
+#   Godar, Marton
+#   Horvath, Gabriella
+#   Koppany, Csaba
+#   Kovacs, Ferenc
+#   Kovacs, Zoltan
+#   Kremer, Peter
+#   Lovassy, Arpad
+#   Ormandi, Matyas
+#   Pilisi, Gergely
+#   Raduly, Csaba
+#   Szabados, Kristof
+#   Szabo, Janos Zoltan – initial implementation
+#   Torpis, Zsolt
+#   Zalanyi, Balazs Andor
+#
+##############################################################################
 # Main Makefile for the TTCN-3 Test Executor
 # For use with GNU make only.
 
@@ -15,7 +37,7 @@ include $(TOP)/Makefile.cfg
 ALLDIRS := common compiler2 repgen xsdconvert
 
 ifndef MINGW
-       ALLDIRS += core core2 mctr2 loggerplugins
+       ALLDIRS += mctr2 core core2 loggerplugins
 endif
 
 # JNI not supported on Cygwin or Mingw
@@ -65,15 +87,15 @@ endif
          $(MAKE) -C $$dir $@ || exit; \
        done
 ifeq ($(LICENSING), yes)
-       mkdir -p $(ETCDIR)/license
-       cp license/license.dat $(ETCDIR)/license
+       mkdir -p $(ETCDIR)/licensegen
+       cp licensegen/license.dat $(ETCDIR)/license
 endif
        chmod -R +r,go-w $(TTCN3_DIR)
 
 # check is the standard GNU target for running tests
 # (avoids clash with shell builtin 'test')
 check:
-       make -C regression_test report
+       compiler2/compiler -v
 
 ifneq (,$(findstring prereq,$(MAKECMDGOALS)))
 # Export all variables into the environment for the prereq target