diff --git a/Makefile.am b/Makefile.am index 2f0446d60..f9ca98602 100644 --- 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 d87eaf015..a41eb751b 100644 --- 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/customize/Makefile.am b/customize/Makefile.am index 3ce996cca..6e5d540e2 100644 --- 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 25948dbe9..e57e5a506 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -436,9 +436,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 7c2ab09d6..ce742f78f 100644 --- 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/docs/guestfs-hacking.pod b/docs/guestfs-hacking.pod index c643c59be..68040fd4c 100644 --- a/docs/guestfs-hacking.pod +++ b/docs/guestfs-hacking.pod @@ -921,7 +921,7 @@ command, the list of objects and the C<-cclib> libraries in the correct order otherwise. virt_customize_LINK = \ - $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- ... + $(top_builddir)/ocaml-link.sh -cclib '-lutils -lgnu' -- ... The actual rules, which you can examine in F, are a little bit more complicated than this because they have to handle: diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am index 8692431e6..bfc11956d 100644 --- 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 424eddfcb..fa88cc634 100644 --- 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 b7aad053a..fa964e8af 100644 --- 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 3dd7f46bf..451a3478f 100644 --- 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 $@