aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.menhir
diff options
context:
space:
mode:
authorXavier Leroy <xavierleroy@users.noreply.github.com>2018-01-05 09:50:10 +0100
committerGitHub <noreply@github.com>2018-01-05 09:50:10 +0100
commit9ccb6a24541b3a06b600a70791950eecd46d1806 (patch)
tree4b7389a1085bb4e744a129dd97f4d03dafb5ea7e /Makefile.menhir
parent8219490aae44fa79932d913cc69941d6b22a70a3 (diff)
downloadcompcert-kvx-9ccb6a24541b3a06b600a70791950eecd46d1806.tar.gz
compcert-kvx-9ccb6a24541b3a06b600a70791950eecd46d1806.zip
Resynchronize the LICENSE file and the license headers in individual files (#45)
Some files are dual-licensed (GPL + noncommercial license), as marked redundantly in the license headers of those files, and in the LICENSE file. OVer the years those two markings got inconsistent. This commit updates the LICENSE file and the license headers of some files so that they agree on which files are dual-licensed. Some build-related files were dual-licensed but some others were not. Fixed by dual-licensing configure, Makefile.menhir, extraction/extraction.v, */extractionMachdep.v Moved lib/Json* to backend/ because there is no need to dual-license those files, yet lib/* is dual-licensed. Plus: JsonAST did not really belong in lib/ anyway, as it depends on AST which is not in lib/
Diffstat (limited to 'Makefile.menhir')
-rw-r--r--Makefile.menhir3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.menhir b/Makefile.menhir
index 1530536f..98bfc750 100644
--- a/Makefile.menhir
+++ b/Makefile.menhir
@@ -6,6 +6,9 @@
# #
# Copyright Institut National de Recherche en Informatique et en #
# Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 2 of the License, or #
+# (at your option) any later version. This file is also distributed #
# under the terms of the INRIA Non-Commercial License Agreement. #
# #
#######################################################################