Manual: move Makefile.tools to root directory

Since, Makefile.tools is used by both the testsuite and the manual, it
should be moved to the first common ancestor of the two subdirectories:
the root directory.

Note: also remove testsuite/lib/empty and use noinit when invoking the
ocaml interpreter.
master
octachron 2016-04-25 13:02:53 +02:00
parent 3383bb78f3
commit 199575a57a
5 changed files with 11 additions and 6 deletions

View File

@ -13,6 +13,13 @@
#* *
#**************************************************************************
# This makefile provides variables for using the in-tree compiler,
# interpreter, lexer and other associated tools. It is intended to be
# included within other makefiles.
# See testsuite/makefiles/Makefile.common, manual/tools/Makefile and
# manual/manual/tutorials/Makefile as examples.
# Note that these makefile should define the $(TOPDIR) variable on their
# own.
WINTOPDIR=`cygpath -m "$(TOPDIR)"`
@ -66,8 +73,7 @@ else
CUSTOM =
endif
OCAML=$(OCAMLRUN) $(OTOPDIR)/ocaml $(OCFLAGS) \
-init $(OTOPDIR)/testsuite/lib/empty
OCAML=$(OCAMLRUN) $(OTOPDIR)/ocaml $(OCFLAGS) -noinit
EXPECT_TEST=$(OCAMLRUN) $(OTOPDIR)/testsuite/tools/expect_test$(EXE)
ifeq "$(FLEXLINK)" ""
FLEXLINK_PREFIX=

View File

@ -1,7 +1,7 @@
FILES= coreexamples.tex lablexamples.tex objectexamples.tex moduleexamples.tex advexamples.tex
TOPDIR=../../..
include $(TOPDIR)/testsuite/makefiles/Makefile.tools
include $(TOPDIR)/Makefile.tools
CAMLLATEX= $(OCAMLRUN) ../../tools/caml-tex2
TEXQUOTE=../../tools/texquote2

View File

@ -1,7 +1,6 @@
TOPDIR=../..
LD_PATH=$(TOPDIR)/otherlibs/str
COMPFLAGS=-I $(OTOPDIR)/otherlibs/str -I $(OTOPDIR)/otherlibs/unix
include $(TOPDIR)/testsuite/makefiles/Makefile.tools
include $(TOPDIR)/Makefile.tools
CFLAGS=-g -O

View File

View File

@ -14,7 +14,7 @@
#**************************************************************************
TOPDIR=$(BASEDIR)/..
include $(BASEDIR)/makefiles/Makefile.tools
include $(TOPDIR)/Makefile.tools
defaultpromote:
@for file in *.reference; do \