Commit e24dac47 authored by Andrei Paskevich's avatar Andrei Paskevich

generate .merlin file

parent b6164aa2
......@@ -35,7 +35,7 @@ why3.conf
/distrib
/why3regtests.err
/why3regtests.out
/META
/.merlin
# /bench/
/bench/programs/good/booleans/
......
S src/util
S src/core
S src/driver
S src/mlw
S src/parser
S src/transform
S src/printer
S src/whyml
S src/session
S src/tools
S src/ide
S src/coq-tactic
S src/why3session
S src/why3doc
S src/jessie
S plugins/parser
S plugins/printer
S plugins/transform
S plugins/tptp
B src/util
B src/core
B src/driver
B src/mlw
B src/parser
B src/transform
B src/printer
B src/whyml
B src/session
B src/tools
B src/ide
B src/coq-tactic
B src/why3session
B src/why3doc
B src/jessie
B plugins/parser
B plugins/printer
B plugins/transform
B plugins/tptp
B lib/why3
PKG str unix num dynlink @ZIPLIB@ @LABLGTK2PKG@ @META_OCAMLGRAPH@
......@@ -1802,6 +1802,9 @@ src/jessie/Makefile: src/jessie/Makefile.in config.status
src/config.sh: src/config.sh.in config.status
./config.status chmod --file $@
.merlin: .merlin.in config.status
./config.status chmod --file $@
src/util/config.ml share/Makefile.config: src/config.sh
$(if $(QUIET),@echo 'Generate $@' &&) \
BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) DATADIR=$(DATADIR) src/config.sh
......@@ -1830,7 +1833,7 @@ configure: configure.in Version
.PHONY: distclean
distclean: clean
rm -f config.status config.cache config.log \
rm -f config.status config.cache config.log .merlin \
Makefile src/util/config.ml doc/version.tex
depend:
......
......@@ -85,12 +85,6 @@ AC_ARG_ENABLE(ide,
AS_HELP_STRING([--disable-ide], [do not build Why3 IDE]),,
enable_ide=yes)
# Bench
AC_ARG_ENABLE(bench,
AS_HELP_STRING([--disable-bench], [do not build Why3 benchmarking tool]),,
enable_bench=yes)
# Coq tactic and libraries
AC_ARG_ENABLE(coq-tactic,
......@@ -405,7 +399,6 @@ else
ZIPLIB=
fi
# checking for lablgtk2
if test "$enable_ide" = yes ; then
if test "$USEOCAMLFIND" = yes; then
......@@ -442,6 +435,12 @@ if test "$enable_ide" = yes ; then
fi
fi
if test "$enable_ide" = yes ; then
LABLGTK2PKG="lablgtk2 lablgtk2.init lablgtk2.sourceview2"
else
LABLGTK2PKG=
fi
dnl AC_CHECK_PROG(enable_ide,lablgtk2,yes,no) not always available (Win32)
dnl AC_CHECK_PROG(OCAMLWEB,ocamlweb,ocamlweb,true)
......@@ -706,7 +705,8 @@ AC_SUBST(CAMLP5O)
AC_SUBST(enable_ide)
AC_SUBST(LABLGTK2LIB)
AC_SUBST(enable_bench)
AC_SUBST(LABLGTK2PKG)
AC_SUBST(META_OCAMLGRAPH)
AC_SUBST(enable_zarith)
......@@ -765,10 +765,12 @@ dnl AC_SUBST(PDFVIEWER)
# Finally create the Makefile from Makefile.in
AC_CONFIG_FILES(Makefile src/config.sh doc/version.tex)
AC_CONFIG_FILES(lib/why3/META)
AC_CONFIG_FILES(.merlin)
AC_CONFIG_FILES(src/jessie/Makefile)
AC_CONFIG_COMMANDS([chmod],
chmod a-w Makefile src/config.sh doc/version.tex;
chmod a-w lib/why3/META;
chmod a-w .merlin;
chmod a-w src/jessie/Makefile;
chmod u+x src/config.sh)
......@@ -788,7 +790,6 @@ echo " Native compilation : $enable_native_code"
echo " Profiling : $enable_profiling"
echo "Components"
echo " IDE command : $enable_ide$reason_ide"
echo " Bench command : $enable_bench$reason_bench"
echo " GMP arithmetic : $enable_zarith$reason_zarith"
echo " Compressed sessions : $enable_zip$reason_zip"
echo " Hypothesis selection : $enable_hypothesis_selection$reason_hypothesis_selection"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment