diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2010-11-11 18:03:12 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-11-11 18:03:12 +0000 |
| commit | f6c4026f85fa6ded33a51ec2757abda9f116fd5f (patch) | |
| tree | 469d8fbf29de8eb8ce80dfefaaec092c11f737e4 /ocaml/Makefile.am | |
| parent | d29e9a552f5823d1d8cb8d4962cb1301bbf60b0e (diff) | |
| download | libguestfs-f6c4026f85fa6ded33a51ec2757abda9f116fd5f.tar.gz libguestfs-f6c4026f85fa6ded33a51ec2757abda9f116fd5f.tar.xz libguestfs-f6c4026f85fa6ded33a51ec2757abda9f116fd5f.zip | |
build: xml-light is no longer required (thanks Maxim Koltsov).
At some point we removed the last thing that required
xml-light, but were still testing for it at various places
in the build. This removes all traces.
Diffstat (limited to 'ocaml/Makefile.am')
| -rw-r--r-- | ocaml/Makefile.am | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 77c5be96..21177e09 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -38,7 +38,6 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \ $(WARN_CFLAGS) $(WERROR_CFLAGS) if HAVE_OCAML -if HAVE_XML_LIGHT noinst_DATA = mlguestfs.cma mlguestfs.cmxa META @@ -75,23 +74,23 @@ noinst_DATA += bindtests \ bindtests: bindtests.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ t/guestfs_010_launch: t/guestfs_010_launch.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ t/guestfs_050_lvcreate: t/guestfs_050_lvcreate.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ t/guestfs_060_readdir: t/guestfs_060_readdir.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ t/guestfs_070_threads: t/guestfs_070_threads.cmx mlguestfs.cmxa mkdir -p t @@ -99,11 +98,11 @@ t/guestfs_070_threads: t/guestfs_070_threads.cmx mlguestfs.cmxa t/guestfs_080_optargs: t/guestfs_080_optargs.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ t/guestfs_400_progress: t/guestfs_400_progress.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ # Need to rebuild the tests from source if the main library has # changed at all, otherwise we get inconsistent assumptions. @@ -111,14 +110,14 @@ t/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa $(OCAMLFIND) ocamlopt -package unix,threads -thread -linkpkg -c $< -o $@ t/%.cmx: t/%.ml mlguestfs.cmxa - $(OCAMLFIND) ocamlopt -package xml-light,unix -linkpkg -c $< -o $@ + $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $@ .mli.cmi: - $(OCAMLFIND) ocamlc -package xml-light,unix -c $< -o $@ + $(OCAMLFIND) ocamlc -package unix -c $< -o $@ .ml.cmo: - $(OCAMLFIND) ocamlc -package xml-light,unix -c $< -o $@ + $(OCAMLFIND) ocamlc -package unix -c $< -o $@ .ml.cmx: - $(OCAMLFIND) ocamlopt -package xml-light,unix -c $< -o $@ + $(OCAMLFIND) ocamlopt -package unix -c $< -o $@ depend: .depend @@ -143,7 +142,6 @@ install-data-hook: CLEANFILES += $(noinst_DATA) endif -endif # Tell version 3.79 and up of GNU make to not build goals in this # directory in parallel. (Possible solution for RHBZ#502309). |