From fd6fecea052b608db0e7b328b1b4a2669258a66f Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@trick.home.annexia.org>
Date: Thu, 16 Jul 2009 17:15:40 +0100
Subject: [PATCH 1/1] Miscellaneous fixes for non-srcdir builds.

---
 Makefile.am           | 3 ++-
 appliance/Makefile.am | 2 +-
 java/Makefile.am      | 2 +-
 ocaml/Makefile.am     | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b425ddd..0e468b5 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 7abee80..17a49d7 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 1352394..6ddf8b4 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 bf9760c..b817cc3 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
 
-- 
1.8.3.1