From 7542c9c3f813c23d7d7ac314686d1448d77e9d77 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Wed, 21 Oct 2015 10:45:14 +0200
Subject: [PATCH] [Makefile] use default merlin_plugin
---
src/plugins/e-acsl/Makefile.in | 23 -----------------------
src/plugins/e-acsl/TODO | 1 +
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/src/plugins/e-acsl/Makefile.in b/src/plugins/e-acsl/Makefile.in
index 6a726454549..137e7566d6a 100644
--- a/src/plugins/e-acsl/Makefile.in
+++ b/src/plugins/e-acsl/Makefile.in
@@ -218,29 +218,6 @@ headers::
Makefile.in configure.ac \
share/e-acsl/*.[ch] share/e-acsl/*/*.[ch]
-##########
-# Merlin #
-##########
-
-FRAMAC_SRC?=$(FRAMAC_TOP_SRCDIR)
-
-$(PLUGIN_DIR)/.merlin: $(PLUGIN_DIR)/Makefile
- echo "FLG $(FRAMAC_USER_MERLIN_FLAGS)" > $@
- find `echo "$(FRAMAC_SRC)/src" | xargs -n 1 -d ' ' readlink -f` \( -name .svn -o -name tests -o -name doc -o -name result -o -name -o -name oracle -o -name "*.cache" -o -name .git \) -prune -o \( -type d -printf "S %p\n" \) >> $@
-ifeq ("$(FRAMAC_MAKE)","yes")
-# internal compilation: do not assume kernel files are already installed
- find `echo "$(FRAMAC_SRC)/src" | xargs -n 1 -d ' ' readlink -f` \( -name .svn -o -name tests -o -name doc -o -name result -o -name -o -name oracle -o -name "*.cache" -o -name .git \) -prune -o \( -type d -printf "B %p\n" \) >> $@
-
-else
- echo "B $(FRAMAC_LIBDIR)" >> $@
-endif
- echo $(OCAMLGRAPH_MERLIN) >> $@
- echo "PKG findlib" >> $@
- echo "PKG zarith" >> $@
- echo "PKG lablgtk2" >> $@
-
-merlin: $(PLUGIN_DIR)/.merlin
-
################
# Generic part #
################
diff --git a/src/plugins/e-acsl/TODO b/src/plugins/e-acsl/TODO
index 49e5baf642c..e3029630f0b 100644
--- a/src/plugins/e-acsl/TODO
+++ b/src/plugins/e-acsl/TODO
@@ -14,6 +14,7 @@
sujet
- [Tout le monde] scripts de compilation du programme généré
- [Enseignement] assigns
+- multithreading
=====
- Voir avec Guillaume et Nikolaï ce dont ils ont besoin comme API pour faire
--
GitLab