split into two major parts:

[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 cd0b51fa2a113de75ed8f5ca584f3cb2a4460c30..b72205ac71ab48c75a09067441d6331b1c2a039c 100644 (file)
--- a/helm/DEVEL/mathml_editor/ocaml/Makefile.am
+++ b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
@@ -21,7 +21,7 @@ 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 -lstdc++ -L$(top_builddir)/src/.libs/ -leditex
 BYTE_STUFF = i_mathml_editor.cmi mathml_editor.cmi $(ARCHIVE).cma $(DLL) lib$(ARCHIVE).a
@@ -69,15 +69,8 @@ $(ARCHIVE).cma: $(CMO_S)
 $(ARCHIVE).cmxa: $(CMX_S)
        $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMX_S) $(SHARED_LIBS)
 
-# use .lo for ocamlmklib
-$(DLL) $(ARCHIVE).a: $(LO_S)
-       for f in $(LO_S); do    \
-               cp $$f $$f.o;   \
-       done
-       $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(SHARED_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 $<