diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2012-01-23 23:17:37 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-01-24 18:23:24 +0000 |
| commit | 09336d6dbb79f52d893a1b2478cc72da44772287 (patch) | |
| tree | d839cfca5781839d5bd6cfb0b44e4c7a9c7ec2ba | |
| parent | 955b4a17969b45b5ff040961b913442e81af81ae (diff) | |
| download | libguestfs-09336d6dbb79f52d893a1b2478cc72da44772287.tar.gz libguestfs-09336d6dbb79f52d893a1b2478cc72da44772287.tar.xz libguestfs-09336d6dbb79f52d893a1b2478cc72da44772287.zip | |
resize, sparsify: find progress mini-library in out-of-tree builds (2)
(cherry picked from commit b7122eaa58ccd153a8c39bc3b6f890755c5df089)
| -rw-r--r-- | resize/Makefile.am | 2 | ||||
| -rw-r--r-- | sparsify/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/resize/Makefile.am b/resize/Makefile.am index 48240d1e..ce9186f2 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -39,7 +39,7 @@ SOURCES += \ # Note this list must be in dependency order. OBJECTS = \ - ../fish/guestfish-progress.o \ + $(top_builddir)/fish/guestfish-progress.o \ progress_c.o \ utils.cmx \ progress.cmx \ diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 8d1ddc44..b33e121f 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -38,7 +38,7 @@ SOURCES += \ # Note this list must be in dependency order. OBJECTS = \ - ../fish/guestfish-progress.o \ + $(top_builddir)/fish/guestfish-progress.o \ progress_c.o \ utils.cmx \ progress.cmx \ @@ -49,7 +49,7 @@ bin_SCRIPTS = virt-sparsify # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L # option to be passed to gcc, so we don't try linking against an # installed copy of libguestfs. -OCAMLPACKAGES = -package unix -I $(top_builddir)/src/.libs -I ../ocaml +OCAMLPACKAGES = -package unix -I $(top_builddir)/src/.libs -I $(top_builddir)/ocaml OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) |