X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2FDEVEL%2Fmathml_editor%2Focaml%2FMakefile.am;h=b72205ac71ab48c75a09067441d6331b1c2a039c;hb=d3c72d6856cd185e5b3e9f2e8b928b78c7031ed1;hp=b43a0650eac71e4c12b8c40112a43ab1abb3fdb8;hpb=6443fd5b20956aa4eb9df73e4bc56824be0bef4b;p=helm.git

diff --git a/helm/DEVEL/mathml_editor/ocaml/Makefile.am b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
index b43a0650e..b72205ac7 100644
--- a/helm/DEVEL/mathml_editor/ocaml/Makefile.am
+++ b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
@@ -2,9 +2,10 @@ PKGNAME = mathml-editor
 ARCHIVE = mlmathml-editor
 REQUIRES = gdome2 gdome2-xslt
 OCAMLFIND = @OCAMLFIND@
-OCAMLC = $(OCAMLFIND) @OCAMLC@ -package "$(REQUIRES)"
-OCAMLOPT = $(OCAMLFIND) @OCAMLOPT@ -package "$(REQUIRES)"
-OCAMLDEP = $(OCAMLFIND) @OCAMLDEP@ -package "$(REQUIRES)"
+OCAMLFLAGS = -I $(top_srcdir)/ocaml
+OCAMLC = $(OCAMLFIND) @OCAMLC@ $(OCAMLFLAGS) -package "$(REQUIRES)"
+OCAMLOPT = $(OCAMLFIND) @OCAMLOPT@ $(OCAMLFLAGS) -package "$(REQUIRES)"
+OCAMLDEP = $(OCAMLFIND) @OCAMLDEP@ $(OCAMLFLAGS) -package "$(REQUIRES)"
 if HAVE_SHAREDLIBS_COND
 OCAMLMKLIBFLAGS = 
 else
@@ -20,17 +21,17 @@ INIT =
 CMI_S = $(MODULES:%=%.cmi)
 CMO_S = $(MODULES:%=%.cmo)
 CMX_S = $(MODULES:%=%.cmx)
-O_S = ml_mathml_editor.o c_mathml_editor.o
+O_S = .libs/ml_mathml_editor.o .libs/c_mathml_editor.o
 LO_S = $(O_S:%.o=%.lo)
-SHARED_LIBS = $(GMETADOM_LIBS) $(GDOMEXSLT_LIBS) -lmlgdome2-xslt -lmlgdome
-BYTE_STUFF = i_mathml_editor.cmi mathml_editor.cmi $(ARCHIVE).cma $(DLL)
+SHARED_LIBS = $(GMETADOM_LIBS) $(GDOMEXSLT_LIBS) -lmlgdome2-xslt -lmlgdome -lstdc++ -L$(top_builddir)/src/.libs/ -leditex
+BYTE_STUFF = i_mathml_editor.cmi mathml_editor.cmi $(ARCHIVE).cma $(DLL) lib$(ARCHIVE).a
 NATIVE_STUFF = $(ARCHIVE).cmxa $(ARCHIVE).a
-BYTE_INSTALL_STUFF = $(BYTE_STUFF) META
+BYTE_INSTALL_STUFF = $(BYTE_STUFF) META mathml_editor.mli
 NATIVE_INSTALL_STUFF = $(NATIVE_STUFF)
 
 EXTRA_DIST =	\
-	META.in mathml_editor.ml i_mathml_editor.ml	\
-	ml_mathml_editor.h c_mathml_editor.h .depend
+	META.in mathml_editor.ml mathml_editor.mli i_mathml_editor.ml	\
+	c_mathml_editor.h .depend
 
 if HAVE_OCAMLOPT_COND
 noinst_DATA = $(BYTE_STUFF) $(NATIVE_STUFF)
@@ -68,15 +69,8 @@ $(ARCHIVE).cma: $(CMO_S)
 $(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
+$(DLL) $(ARCHIVE).a: $(O_S)
+	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(SHARED_LIBS) $(O_S)
 
 %.cmi: %.mli
 	$(OCAMLC) -c $<
@@ -90,7 +84,7 @@ i_mathml_editor.cmo: i_mathml_editor.ml
 i_mathml_editor.cmx: i_mathml_editor.ml
 	$(OCAMLOPT) -c $<
 
-depend: *.ml *.mli
+depend: *.ml
 	$(OCAMLDEP) *.ml *.mli >.depend
 include .depend