diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-16 17:15:40 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-16 17:15:40 +0100 |
| commit | fd6fecea052b608db0e7b328b1b4a2669258a66f (patch) | |
| tree | 28ff1fd84d7c9cea6a8422d06d4b18ebb829761c | |
| parent | 7428b0a70caed014d0cb4126fe8a77432d8957c6 (diff) | |
| download | libguestfs-fd6fecea052b608db0e7b328b1b4a2669258a66f.tar.gz libguestfs-fd6fecea052b608db0e7b328b1b4a2669258a66f.tar.xz libguestfs-fd6fecea052b608db0e7b328b1b4a2669258a66f.zip | |
Miscellaneous fixes for non-srcdir builds.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | appliance/Makefile.am | 2 | ||||
| -rw-r--r-- | java/Makefile.am | 2 | ||||
| -rw-r--r-- | ocaml/Makefile.am | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index b425ddd5..0e468b58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,12 +155,13 @@ dist-hook: # Update the list of translatable files in po/POTFILES.in. all-local: + cd $(srcdir); \ find -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ grep -v '/blib/' | \ grep -v '/capitests/' | \ grep -v '/examples/' | \ sort | \ - sed 's,^\./,,' > $(srcdir)/po/POTFILES.in + sed 's,^\./,,' > po/POTFILES.in # Pkgconfig. diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 7abee80d..17a49d7f 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -144,7 +144,7 @@ test-boot-realistic: emptydisk # Make clean. -CLEANFILES = $(APPLIANCE_FILES) +CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist clean-local: rm -rf $(top_builddir)/initramfs diff --git a/java/Makefile.am b/java/Makefile.am index 1352394b..6ddf8b48 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -21,7 +21,7 @@ builddir ?= $(top_builddir)/java java_prefix = com/redhat/et/libguestfs # Pull in automatically generated built sources -include $(builddir)/Makefile.inc +include $(srcdir)/Makefile.inc java_sources = \ $(java_built_sources) \ diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index bf9760c3..b817cc37 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -76,11 +76,11 @@ t/guestfs_060_readdir: t/guestfs_060_readdir.ml mlguestfs.cmxa $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@ .mli.cmi: - $(OCAMLFIND) ocamlc -c $< + $(OCAMLFIND) ocamlc -c $< -o $@ .ml.cmo: - $(OCAMLFIND) ocamlc -c $< + $(OCAMLFIND) ocamlc -c $< -o $@ .ml.cmx: - $(OCAMLFIND) ocamlopt -c $< + $(OCAMLFIND) ocamlopt -c $< -o $@ depend: .depend |