ocaml 3.09 transition

[helm.git] / helm / DEVEL / gdome_xslt / ocaml / test / Makefile.am

diff --git a/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am b/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am
index 44f2658cbd48791667bf14acd500881da17f5960..95f83fa79936ad4ab82b7bf40015e48f7022a669 100644 (file)
--- a/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am
@@ -2,11 +2,11 @@ REQUIRES = gdome2
 OCAMLFIND = @OCAMLFIND@
 OCAMLC = $(OCAMLFIND) @OCAMLC@ -package "$(REQUIRES)"
 OCAMLOPT = $(OCAMLFIND) @OCAMLOPT@ -package "$(REQUIRES)"
-CMA = ../gdome_xslt/mlgdome2-xslt.cma
-CMXA = ../gdome_xslt/mlgdome2-xslt.cmxa
-INIT_CMO = ../gdome_xslt/gdome_xslt_init.cmo
-INIT_CMX = ../gdome_xslt/gdome_xslt_init.cmx
-INCLUDES = -I ../gdome_xslt/
+CMA = $(top_builddir)/ocaml/gdome_xslt/mlgdome2-xslt.cma
+CMXA = $(top_builddir)/ocaml/gdome_xslt/mlgdome2-xslt.cmxa
+INIT_CMO = $(top_builddir)/ocaml/gdome_xslt/gdome_xslt_init.cmo
+INIT_CMX = $(top_builddir)/ocaml/gdome_xslt/gdome_xslt_init.cmx
+OCAMLC_FLAGS = -I $(top_builddir)/ocaml/gdome_xslt/
 
 EXTRA_DIST = test.ml
 CLEANFILES = test{,.o,.opt} test.cm[iox]
@@ -18,7 +18,8 @@ noinst_DATA = test
 endif
 
 test: test.ml $(CMA) $(INIT_CMO)
-       $(OCAMLC) -o $@ -linkpkg $(INCLUDES) $(CMA) $(INIT_CMO) $<
+       $(OCAMLC) -o $@ -linkpkg $(OCAMLC_FLAGS) $(CMA) $(INIT_CMO) $<
+
 test.opt: test.ml $(CMXA) $(INIT_CMX)
-       $(OCAMLOPT) -o $@ -linkpkg $(INCLUDES) $(CMXA) $(INIT_CMX) $<
+       $(OCAMLOPT) -o $@ -linkpkg $(OCAMLC_FLAGS) $(CMXA) $(INIT_CMX) $<