From: Luca Padovani <luca.padovani@unito.it>
Date: Thu, 13 Mar 2003 10:44:35 +0000 (+0000)
Subject: * disable-shared doens't bother ocaml
X-Git-Tag: V_0_0_4_2~10
X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=commitdiff_plain;h=6443fd5b20956aa4eb9df73e4bc56824be0bef4b

* disable-shared doens't bother ocaml
---

diff --git a/helm/DEVEL/mathml_editor/LICENSE b/helm/DEVEL/mathml_editor/LICENSE
index 122827fd6..ee8db273a 100644
--- a/helm/DEVEL/mathml_editor/LICENSE
+++ b/helm/DEVEL/mathml_editor/LICENSE
@@ -1,4 +1,5 @@
-// Copyright (C) 2002-2003, Luca Padovani <luca.padovani@cs.unibo.it>.
+// Copyright (C) 2002-2003, Luca Padovani <luca.padovani@cs.unibo.it>,
+//                    2003, Paolo Marinelli <pmarinel@cs.unibo.it>.
 //
 // This file is part of EdiTeX, an editor of mathematical
 // expressions based on TeX syntax
diff --git a/helm/DEVEL/mathml_editor/configure.ac b/helm/DEVEL/mathml_editor/configure.ac
index 2ea4dfb15..17b35b57e 100644
--- a/helm/DEVEL/mathml_editor/configure.ac
+++ b/helm/DEVEL/mathml_editor/configure.ac
@@ -225,6 +225,7 @@ else
   OCAMLMKLIB=ocamlmklib
   AC_SUBST(OCAMLMKLIB)
 fi
+AM_CONDITIONAL(HAVE_SHAREDLIBS_COND, test x$enable_shared = xyes)
 
 AC_MSG_CHECKING(for gdome2 ocaml binding)
 ocamlfind query gdome2 ||
diff --git a/helm/DEVEL/mathml_editor/ocaml/Makefile.am b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
index 9962bf6b5..b43a0650e 100644
--- a/helm/DEVEL/mathml_editor/ocaml/Makefile.am
+++ b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
@@ -5,7 +5,12 @@ OCAMLFIND = @OCAMLFIND@
 OCAMLC = $(OCAMLFIND) @OCAMLC@ -package "$(REQUIRES)"
 OCAMLOPT = $(OCAMLFIND) @OCAMLOPT@ -package "$(REQUIRES)"
 OCAMLDEP = $(OCAMLFIND) @OCAMLDEP@ -package "$(REQUIRES)"
-OCAMLMKLIB = @OCAMLMKLIB@
+if HAVE_SHAREDLIBS_COND
+OCAMLMKLIBFLAGS = 
+else
+OCAMLMKLIBFLAGS = -custom
+endif
+OCAMLMKLIB = @OCAMLMKLIB@ $(OCAMLMKLIBFLAGS)
 DLL = dll$(ARCHIVE).so
 OCAMLSTDLIBDIR = $(DESTDIR)/@OCAMLSTDLIBDIR@
 OCAMLSTUBDIR = $(DESTDIR)/@OCAMLSTUBDIR@
@@ -16,12 +21,12 @@ CMI_S = $(MODULES:%=%.cmi)
 CMO_S = $(MODULES:%=%.cmo)
 CMX_S = $(MODULES:%=%.cmx)
 O_S = ml_mathml_editor.o c_mathml_editor.o
+LO_S = $(O_S:%.o=%.lo)
 SHARED_LIBS = $(GMETADOM_LIBS) $(GDOMEXSLT_LIBS) -lmlgdome2-xslt -lmlgdome
-BYTE_STUFF = $(ARCHIVE).cma
+BYTE_STUFF = i_mathml_editor.cmi mathml_editor.cmi $(ARCHIVE).cma $(DLL)
 NATIVE_STUFF = $(ARCHIVE).cmxa $(ARCHIVE).a
-BYTE_INSTALL_STUFF =	\
-	i_mathml_editor.cmi mathml_editor.cmi $(ARCHIVE).cma $(DLL) META
-NATIVE_INSTALL_STUFF = $(ARCHIVE).a $(ARCHIVE).cmxa
+BYTE_INSTALL_STUFF = $(BYTE_STUFF) META
+NATIVE_INSTALL_STUFF = $(NATIVE_STUFF)
 
 EXTRA_DIST =	\
 	META.in mathml_editor.ml i_mathml_editor.ml	\
@@ -33,17 +38,11 @@ else
 noinst_DATA = $(BYTE_STUFF)
 endif
 
-noinst_LTLIBRARIES = libmlmathml_editor.la
+noinst_LTLIBRARIES = libmlmathml-editor.la
 libmlmathml_editor_la_SOURCES = \
   c_mathml_editor.cc \
   ml_mathml_editor.c
 
-#test: test.ml $(ARCHIVE).cma
-#	$(OCAMLC) -o $@ -linkpkg $(INCLUDES) $<
-
-#test.opt: test.ml $(ARCHIVE).cmxa
-#	$(OCAMLOPT) -o $@ -linkpkg $(INCLUDES) $<
-
 if HAVE_OCAMLOPT_COND
 install-data-local:	$(BYTE_INSTALL_STUFF) $(NATIVE_INSTALL_STUFF)
 else
@@ -56,17 +55,28 @@ endif
 
 CLEANFILES =	\
 	$(ARCHIVE).{cma,cmxa,a} $(CMI_S) $(CMO_S) $(CMX_S) ml_mathml_editor.o	\
-	$(DLL) $(INIT).cm[iox] libmlmathml_editor.a
+	$(DLL) $(INIT).cm[iox] libmlmathml-editor.a
 
 INCLUDES =	\
 	$(GDOME_CFLAGS)	$(MLGDOME_CFLAGS) \
 	$(GMETADOM_CFLAGS) $(GDOMEXSLT_CFLAGS) \
 	-I$(top_srcdir)/src
 
-$(ARCHIVE).cma $(DLL): $(CMO_S)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMO_S) $(O_S) $(SHARED_LIBS)
-$(ARCHIVE).cmxa $(ARCHIVE).a: $(CMX_S)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMX_S) $(O_S) $(SHARED_LIBS)
+$(ARCHIVE).cma: $(CMO_S)
+	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMO_S) $(SHARED_LIBS)
+
+$(ARCHIVE).cmxa: $(CMX_S)
+	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMX_S) $(SHARED_LIBS)
+
+$(DLL) $(ARCHIVE).a: $(LO_S)
+	# use .lo for ocamlmklib
+	for f in $(LO_S); do	\
+		cp $$f $$f.o;	\
+	done
+	$(OCAMLMKLIB) -o $(ARCHIVE) $(GDOME_LIBS) $(LO_S:%=%.o)
+	for f in $(LO_S:%=%.o); do	\
+		rm $$f;	\
+	done
 
 %.cmi: %.mli
 	$(OCAMLC) -c $<