projects / libguestfs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 67f6950)
Make sure that generated ocaml-link.sh is used in out-of-tree builds
authorHilko Bengen <bengen@debian.org>
Tue, 10 Mar 2020 19:06:39 +0000 (20:06 +0100)
committerHilko Bengen <bengen@debian.org>
Sat, 30 May 2020 21:42:24 +0000 (22:42 +0100)
Gbp-Pq: Name 0017-Make-sure-that-generated-ocaml-link.sh-is-used-in-ou.patch

14 files changed:
Makefile.am patch | blob | history
builder/Makefile.am patch | blob | history
common/mlpcre/Makefile.am patch | blob | history
common/mlstdutils/Makefile.am patch | blob | history
common/mltools/Makefile.am patch | blob | history
common/mlutils/Makefile.am patch | blob | history
common/mlvisit/Makefile.am patch | blob | history
customize/Makefile.am patch | blob | history
daemon/Makefile.am patch | blob | history
dib/Makefile.am patch | blob | history
get-kernel/Makefile.am patch | blob | history
resize/Makefile.am patch | blob | history
sparsify/Makefile.am patch | blob | history
sysprep/Makefile.am patch | blob | history

diff --git a/Makefile.am b/Makefile.am
index 27f2c6eed2a1cbf4ed256c64bf2420d593c9b519..596b92650e15482f9232e1c52638e93e5f60206a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -237,7 +237,6 @@ EXTRA_DIST = \
        logo/fish-10yrs.svg logo/fish-10yrs.png \
        logo/virt-builder.svg \
        m4/.gitignore \
-       ocaml-link.sh \
        podcheck.pl \
        tests/automake2junit.ml \
        tests/test-functions.sh \
diff --git a/builder/Makefile.am b/builder/Makefile.am
index d87eaf0157ef8a0d74de4a97b6422aef16ddeafb..a41eb751bffe1452007acd786cf0468eaf696803 100644 (file)
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -240,9 +240,9 @@ virt_builder_DEPENDENCIES = \
        ../common/mltools/mltools.$(MLARCHIVE) \
        ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
        ../customize/customize.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 virt_builder_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(OBJECTS) -o $@
 
@@ -250,9 +250,9 @@ virt_builder_repository_DEPENDENCIES = \
        $(REPOSITORY_OBJECTS) \
        ../common/mltools/mltools.$(MLARCHIVE) \
        ../common/mlxml/mlxml.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 virt_builder_repository_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(REPOSITORY_OBJECTS) -o $@
 
@@ -348,9 +348,9 @@ endif
 index_parser_tests_DEPENDENCIES = \
        $(index_parser_tests_THEOBJECTS) \
        ../common/mltools/mltools.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 index_parser_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) $(OCAMLLINKFLAGS) \
          $(index_parser_tests_THEOBJECTS) -o $@
 
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 ce4d1ac9a9d18d8a3a6c9a4c062247daf5c13dc3..b58f1f687e95ed8c9415adb35a1adc8d1a065187 100644 (file)
--- a/common/mltools/Makefile.am
+++ b/common/mltools/Makefile.am
@@ -262,9 +262,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 $@
@@ -275,9 +275,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 $@
@@ -288,9 +288,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 $@
@@ -301,9 +301,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 $@
@@ -314,9 +314,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 $@
@@ -327,9 +327,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 a07c2827d9b1a8bec755ee4dba6f42b775dbbb69..870fde2bacf3914524810afc435fdd63d0b356ea 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) \
diff --git a/customize/Makefile.am b/customize/Makefile.am
index 3ce996cca3b85f6ffaba39f718e2c5c24879d1bb..6e5d540e2a8d56d97fd2719fed2b1a783aa418a4 100644 (file)
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -179,7 +179,7 @@ OCAMLCLIBS = \
 OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
 
 virt_customize_DEPENDENCIES = \
-       $(top_srcdir)/ocaml-link.sh \
+       $(top_builddir)/ocaml-link.sh \
        $(CUSTOMIZE_THEOBJECTS) \
        $(CUSTOMIZE_CMA) \
        ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
@@ -189,7 +189,7 @@ virt_customize_DEPENDENCIES = \
        ../common/mltools/mltools.$(MLARCHIVE) \
        ../common/mlcustomize/mlcustomize.$(MLARCHIVE)
 virt_customize_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(CUSTOMIZE_THEOBJECTS) -o $@
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 0256434bda6d9283c9870272b0e14d350ddd922c..98280c96a7adbb64a37489b1c5b2967bf70712e1 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -437,9 +437,9 @@ OCAMLLINKFLAGS = \
 
 daemon_utils_tests_DEPENDENCIES = \
        $(daemon_utils_tests_THEOBJECTS) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 daemon_utils_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh \
+       $(top_builddir)/ocaml-link.sh \
          -cclib '-lutils -lgnu' \
          -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
diff --git a/dib/Makefile.am b/dib/Makefile.am
index 7c2ab09d6381ee1670878869a9372e35137fbb6d..ce742f78faeda78a8e3580c65379df5f4dabfde6 100644 (file)
--- a/dib/Makefile.am
+++ b/dib/Makefile.am
@@ -123,9 +123,9 @@ virt_dib_DEPENDENCIES = \
        ../common/mlgettext/mlgettext.$(MLARCHIVE) \
        ../common/mlpcre/mlpcre.$(MLARCHIVE) \
        ../common/mltools/mltools.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 virt_dib_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(OBJECTS) -o $@
 
diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am
index 8692431e688730ba61563428b9c92197517e0cbb..bfc11956df4b6fcf8fd5f361ed51fe4b96d7cd50 100644 (file)
--- a/get-kernel/Makefile.am
+++ b/get-kernel/Makefile.am
@@ -105,9 +105,9 @@ virt_get_kernel_DEPENDENCIES = \
        ../common/mlgettext/mlgettext.$(MLARCHIVE) \
        ../common/mlpcre/mlpcre.$(MLARCHIVE) \
        ../common/mltools/mltools.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 virt_get_kernel_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(OBJECTS) -o $@
 
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 424eddfcb1e5ee2bb347489f817945a6dd748c27..fa88cc634fcbf546599fbd8bb499029bce0e9192 100644 (file)
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -104,9 +104,9 @@ virt_resize_DEPENDENCIES = \
        ../common/mlgettext/mlgettext.$(MLARCHIVE) \
        ../common/mlpcre/mlpcre.$(MLARCHIVE) \
        ../common/mltools/mltools.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 virt_resize_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(OBJECTS) -o $@
 
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index b7aad053a5aa4fe7bf528d112b56f00c6a2ef458..fa964e8afcd06a1d479529fd5c093d9a79f1f86f 100644 (file)
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -112,9 +112,9 @@ virt_sparsify_DEPENDENCIES = \
        ../common/mlgettext/mlgettext.$(MLARCHIVE) \
        ../common/mlpcre/mlpcre.$(MLARCHIVE) \
        ../common/mltools/mltools.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 virt_sparsify_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(OBJECTS) -o $@
 
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index 3dd7f46bf369ff26224b5668ba8c9fd544bd56ba..451a3478f6904110ad3416c8debd798cc927e3d7 100644 (file)
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -165,9 +165,9 @@ virt_sysprep_DEPENDENCIES = \
        ../common/mltools/mltools.$(MLARCHIVE) \
        ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
        ../customize/customize.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 virt_sysprep_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
          $(OBJECTS) -o $@
 
Unnamed repository; edit this file 'description' to name the repository.