distribute also ocaml subdirs

[helm.git] / helm / DEVEL / mathml_editor / ocaml / Makefile.am

diff --git a/helm/DEVEL/mathml_editor/ocaml/Makefile.am b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
index b43a0650eac71e4c12b8c40112a43ab1abb3fdb8..97c09df350df28f55c403168280334de64a6848a 100644 (file)
--- 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
@@ -23,14 +24,14 @@ 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 = i_mathml_editor.cmi mathml_editor.cmi $(ARCHIVE).cma $(DLL)
+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
 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
+       c_mathml_editor.h .depend
 
 if HAVE_OCAMLOPT_COND
 noinst_DATA = $(BYTE_STUFF) $(NATIVE_STUFF)
@@ -90,7 +91,7 @@ i_mathml_editor.cmo: i_mathml_editor.ml
 i_mathml_editor.cmx: i_mathml_editor.ml
        $(OCAMLOPT) -c $<
 
-depend: *.ml *.mli
-       $(OCAMLDEP) *.ml *.mli >.depend
+depend: *.ml
+       $(OCAMLDEP) *.ml >.depend
 include .depend