Ocaml example makefiles tweaks for consistency with other languages. Attempt to add runtime tests to 'make check' - untested.

This commit is contained in:
William S Fulton 2013-04-15 22:45:01 +01:00
commit 280cd16b7e
11 changed files with 85 additions and 68 deletions

View file

@ -893,6 +893,13 @@ ocaml_dynamic_cpp: $(SRCS)
-package dl -linkpkg \ -package dl -linkpkg \
$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings' $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings'
# -----------------------------------------------------------------
# Run ocaml example
# -----------------------------------------------------------------
ocaml_run:
$(RUNTOOL) false $(RUNPIPE)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Version display # Version display
# ----------------------------------------------------------------- # -----------------------------------------------------------------

View file

@ -7,21 +7,22 @@ MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = example_prog.ml
OBJS = example.o OBJS = example.o
all:: static check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
static:: build: static
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_cpp ocaml_static_cpp
dynamic:: dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_dynamic_cpp ocaml_dynamic_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean
check: all

View file

@ -7,27 +7,28 @@ MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = example_prog.ml
OBJS = OBJS =
all:: static check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
dynamic:: build: static
dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_dynamic ocaml_dynamic
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static ocaml_static
toplevel:: toplevel:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_toplevel ocaml_static_toplevel
clean:: clean:
$(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean
check: all

View file

@ -7,27 +7,28 @@ MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = example_prog.ml
OBJS = OBJS =
all:: static check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
dynamic:: build: static
dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_dynamic_cpp ocaml_dynamic_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_cpp ocaml_static_cpp
toplevel:: toplevel:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_cpp_toplevel ocaml_static_cpp_toplevel
clean:: clean:
$(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean
check: all

View file

@ -8,27 +8,28 @@ MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = example_prog.ml
OBJS = example.o OBJS = example.o
all:: static static_top check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
static:: build: static static_top
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_cpp ocaml_static_cpp
static_top:: static_top:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_cpp_toplevel ocaml_static_cpp_toplevel
dynamic:: dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)'
MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_dynamic_cpp ocaml_dynamic_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean
check: all

View file

@ -7,27 +7,28 @@ MLFILE = example.ml
PROGFILE = example_prog.ml PROGFILE = example_prog.ml
OBJS = example.o OBJS = example.o
all:: static check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
dynamic:: build: static
dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_dynamic ocaml_dynamic
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static ocaml_static
toplevel:: toplevel:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \
PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_toplevel ocaml_static_toplevel
clean:: clean:
$(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean
check: all

View file

@ -5,19 +5,20 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
PROGFILE = runme.ml PROGFILE = runme.ml
all default:: static check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
static:: build: static
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp ocaml_static_cpp
dynamic:: dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_dynamic_cpp ocaml_dynamic_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean
check: all

View file

@ -5,19 +5,20 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
PROGFILE = runme.ml PROGFILE = runme.ml
all default:: static check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
static:: build: static
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp ocaml_static_cpp
dynamic:: dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_dynamic_cpp ocaml_dynamic_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean
check: all

View file

@ -5,29 +5,30 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
PROGFILE = runme.ml PROGFILE = runme.ml
all default:: static check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
static:: build: static
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp ocaml_static_cpp
director:: director:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp_director ocaml_static_cpp_director
dynamic:: dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp ocaml_static_cpp
toplevel:: toplevel:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp_toplevel ocaml_static_cpp_toplevel
clean:: clean:
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean
check: all

View file

@ -8,27 +8,28 @@ MLFILE = foolib.ml
PROGFILE = example_prog.ml PROGFILE = example_prog.ml
OBJS = OBJS =
all:: static static_top check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
static:: build: static static_top
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_cpp ocaml_static_cpp
static_top:: static_top:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_static_cpp_toplevel ocaml_static_cpp_toplevel
dynamic:: dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)'
MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \
ocaml_dynamic_cpp ocaml_dynamic_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean
check: all

View file

@ -5,24 +5,25 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
PROGFILE = runme.ml PROGFILE = runme.ml
all default:: static top check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run
static:: build: static top
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp ocaml_static_cpp
dynamic:: dynamic:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp ocaml_static_cpp
top:: top:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
ocaml_static_cpp_toplevel ocaml_static_cpp_toplevel
clean:: clean:
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean
check: all