Make sure that generated ocaml-link.sh is used in out-of-tree builds

Gbp-Pq: Name 0017-Make-sure-that-generated-ocaml-link.sh-is-used-in-ou.patch

diff --git a/common/mlpcre/Makefile.am b/common/mlpcre/Makefile.am
index 1e0b7795c57360fe3c8cef3e5aaac3ebb52c3ca3..9d3c482a3b10230a87451e78009c6f2bf670effb 100644 (file)
--- a/common/mlpcre/Makefile.am
+++ b/common/mlpcre/Makefile.am
@@ -105,9 +105,9 @@ OCAMLLINKFLAGS = $(LINK_CUSTOM_OCAMLC_ONLY)
 pcre_tests_DEPENDENCIES = \
        $(pcre_tests_THEOBJECTS) \
        $(MLPCRE_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 pcre_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh \
+       $(top_builddir)/ocaml-link.sh \
          -cclib '-lutils -lpcre -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \

diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am
index 3b2d146255e720ed843785b66847e0a3a8d17b69..0aacc97b17dbc1d552fc55efa0cc2b6f95e58d1f 100644 (file)
--- a/common/mlstdutils/Makefile.am
+++ b/common/mlstdutils/Makefile.am
@@ -129,9 +129,9 @@ OCAMLLINKFLAGS = $(LINK_CUSTOM_OCAMLC_ONLY)
 std_utils_tests_DEPENDENCIES = \
        $(std_utils_tests_THEOBJECTS) \
        $(MLSTDUTILS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 std_utils_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -- \
+       $(top_builddir)/ocaml-link.sh -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(std_utils_tests_THEOBJECTS) -o $@

diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am
index aea2dce9de475c21263107096e03f4a0fea3e3b9..2ab32984f351997f830953b19483a1db7b56f43a 100644 (file)
--- a/common/mltools/Makefile.am
+++ b/common/mltools/Makefile.am
@@ -265,9 +265,9 @@ tools_utils_tests_DEPENDENCIES = \
        ../mlgettext/mlgettext.$(MLARCHIVE) \
        ../mlpcre/mlpcre.$(MLARCHIVE) \
        $(MLTOOLS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 tools_utils_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(tools_utils_tests_THEOBJECTS) -o $@
@@ -278,9 +278,9 @@ getopt_tests_DEPENDENCIES = \
        ../mlgettext/mlgettext.$(MLARCHIVE) \
        ../mlpcre/mlpcre.$(MLARCHIVE) \
        $(MLTOOLS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 getopt_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(getopt_tests_THEOBJECTS) -o $@
@@ -291,9 +291,9 @@ JSON_tests_DEPENDENCIES = \
        ../mlgettext/mlgettext.$(MLARCHIVE) \
        ../mlpcre/mlpcre.$(MLARCHIVE) \
        $(MLTOOLS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 JSON_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -- \
+       $(top_builddir)/ocaml-link.sh -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(JSON_tests_THEOBJECTS) -o $@
@@ -304,9 +304,9 @@ JSON_parser_tests_DEPENDENCIES = \
        ../mlgettext/mlgettext.$(MLARCHIVE) \
        ../mlpcre/mlpcre.$(MLARCHIVE) \
        $(MLTOOLS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 JSON_parser_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(JSON_parser_tests_THEOBJECTS) -o $@
@@ -317,9 +317,9 @@ machine_readable_tests_DEPENDENCIES = \
        ../mlgettext/mlgettext.$(MLARCHIVE) \
        ../mlpcre/mlpcre.$(MLARCHIVE) \
        $(MLTOOLS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 machine_readable_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(machine_readable_tests_THEOBJECTS) -o $@
@@ -330,9 +330,9 @@ tools_messages_tests_DEPENDENCIES = \
        ../mlgettext/mlgettext.$(MLARCHIVE) \
        ../mlpcre/mlpcre.$(MLARCHIVE) \
        $(MLTOOLS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 tools_messages_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(tools_messages_tests_THEOBJECTS) -o $@

diff --git a/common/mlutils/Makefile.am b/common/mlutils/Makefile.am
index e86d7bb5f665a778465c2acc4f961a8ded05df44..1adefd6de4fde02f1bb335f735b9e2a59bf5e10e 100644 (file)
--- a/common/mlutils/Makefile.am
+++ b/common/mlutils/Makefile.am
@@ -127,9 +127,9 @@ c_utils_unit_tests_DEPENDENCIES = \
        $(c_utils_unit_tests_THEOBJECTS) \
        ../mlstdutils/mlstdutils.$(MLARCHIVE) \
        mlcutils.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 c_utils_unit_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \
          $(OCAMLPACKAGES) -package oUnit \
          $(OCAMLLINKFLAGS) \

diff --git a/common/mlvisit/Makefile.am b/common/mlvisit/Makefile.am
index 6f0932336080fd06d5631153907d1ab188a13245..780ba2af4475f3a311187cc431389b8819a12b8d 100644 (file)
--- a/common/mlvisit/Makefile.am
+++ b/common/mlvisit/Makefile.am
@@ -118,9 +118,9 @@ visit_tests_DEPENDENCIES = \
        $(visit_tests_THEOBJECTS) \
        ../mlutils/mlcutils.$(MLARCHIVE) \
        $(MLVISIT_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 visit_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh \
+       $(top_builddir)/ocaml-link.sh \
          -cclib '-lvisit -lstructs -lutils $(LIBXML2_LIBS) -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \