[r2004-04-13 12:26:36 by jdemouth] Minor enhancements with ML_INTERFACE and corrects a bug with

oCaml_all.cmxa.

Original author: jdemouth
Date: 2004-04-13 12:26:36+00:00

Makefile.distrib

@@ -48,11 +48,6 @@ ifeq ($(NETCLIENT), true)
   SYNTAX += -symbol NETCLIENT=
 endif
 
-ifeq ($(ML_INTERFACE), true)
-  SYNTAX += -symbol ML_INTERFACE=
-  ML_LIB = oCaml_all.cma
-endif
-
 SYNTAX_PARSER = -syntax camlp4o $(SYNTAX:%=-ppopt %)
 
 CAMLC_P = ocamlc -g
@@ -93,8 +88,20 @@ else
 	LINK = $(CAMLC) -custom -linkpkg gramlib.cma
 endif
 
-INSTALL := $(shell which install)
+ifeq ($(ML_INTERFACE), true)
+  SYNTAX += -symbol ML_INTERFACE=
+  ML_LIB = oCaml_all.$(EXTENSION_LIB)
+  ML_INTERFACE_OBJ = \
+	cdo2cmo/ml_types.cmo \
+	cdo2cmo/ml_cduce.cmo \
+	cdo2cmo/ml_ocaml.cmo \
+	cdo2cmo/ml_checker.cmo \
+	cdo2cmo/ml_generator.cmo
+else
+  ML_INTERFACE_OBJ= 
+endif
 
+INSTALL := $(shell which install)
 
 all: cduce cDuce_all.cma dtd2cduce validate
 
@@ -178,13 +185,9 @@ OBJECTS = \
  compile/operators.cmo \
  \
  types/builtin.cmo \
- driver/librarian.cmo \
- cdo2cmo/ml_types.cmo \
- cdo2cmo/ml_cduce.cmo \
- cdo2cmo/ml_ocaml.cmo \
- cdo2cmo/ml_checker.cmo \
- cdo2cmo/ml_generator.cmo \
- driver/cduce.cmo
+ driver/librarian.cmo
+
+OBJECTS += $(ML_INTERFACE_OBJ) driver/cduce.cmo
 
 CQL_OBJECTS= query/query.cmo query/query_parse.cmo 
 CQL_OBJECTS_RUN = query/query_run.cmo