Miscellaneous fixes for non-srcdir builds.

This commit is contained in:
Richard Jones
2009-07-16 17:15:40 +01:00
parent 7428b0a70c
commit fd6fecea05
4 changed files with 7 additions and 6 deletions

View File

@@ -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.

View File

@@ -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

View File

@@ -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) \

View File

@@ -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