git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gettextize the source, make library strings translatable.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
8f81a07
..
fc397cd
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-17,7
+17,7
@@
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src daemon fish examples images
+SUBDIRS = src daemon fish
po
examples images
if HAVE_OCAML
SUBDIRS += ocaml
if HAVE_OCAML
SUBDIRS += ocaml
@@
-34,15
+34,18
@@
endif
if HAVE_JAVA
SUBDIRS += java
endif
if HAVE_JAVA
SUBDIRS += java
endif
+if HAVE_HASKELL
+SUBDIRS += haskell
+endif
if HAVE_INSPECTOR
SUBDIRS += inspector
endif
EXTRA_DIST = \
if HAVE_INSPECTOR
SUBDIRS += inspector
endif
EXTRA_DIST = \
+ config.rpath \
make-initramfs.sh update-initramfs.sh \
guestfs.pod guestfs-actions.pod guestfs-structs.pod \
guestfish.pod guestfish-actions.pod \
make-initramfs.sh update-initramfs.sh \
guestfs.pod guestfs-actions.pod guestfs-structs.pod \
guestfish.pod guestfish-actions.pod \
- libguestfs.spec \
html/pod.css \
HACKING TODO \
tests.c \
html/pod.css \
HACKING TODO \
tests.c \
@@
-55,7
+58,13
@@
EXTRA_DIST = \
recipes/*.example \
html/recipes.css \
make-recipes.sh \
recipes/*.example \
html/recipes.css \
make-recipes.sh \
- test-cleanup.sh
+ test-cleanup.sh \
+ contrib/README \
+ contrib/centos5.3-libguestfs.spec \
+ contrib/fedora-libguestfs.spec \
+ contrib/febootstrap/install.title \
+ contrib/febootstrap/install.html \
+ contrib/febootstrap/install.sh
# Build the root filesystem.
# Currently this is arch-dependent, so it seems like putting it in
# Build the root filesystem.
# Currently this is arch-dependent, so it seems like putting it in
@@
-84,17
+93,21
@@
$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
make-initramfs.sh: make-initramfs.sh.in
./config.status $@
make-initramfs.sh: make-initramfs.sh.in
./config.status $@
-# Tests. These are auto-generated from the test descriptions.
+# Tests. These are auto-generated from the test descriptions
+# in the generator.
-check_PROGRAMS = tests
+check_PROGRAMS = tests
test-command
tests_SOURCES = tests.c
tests_CFLAGS = \
-I$(top_builddir)/src -Wall
tests_LDADD = $(top_builddir)/src/libguestfs.la
tests_SOURCES = tests.c
tests_CFLAGS = \
-I$(top_builddir)/src -Wall
tests_LDADD = $(top_builddir)/src/libguestfs.la
-TESTS = $(check_PROGRAMS)
-TESTS_ENVIRONMENT = $(VG)
+TESTS = tests test-bootbootboot.sh
+TESTS_ENVIRONMENT = \
+ SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
+ SKIP_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \
+ $(VG)
$(TESTS): $(INITRAMFS) $(VMLINUZ)
$(TESTS): $(INITRAMFS) $(VMLINUZ)
@@
-103,6
+116,12
@@
$(TESTS): $(INITRAMFS) $(VMLINUZ)
valgrind:
$(MAKE) check VG="valgrind --quiet --leak-check=full"
valgrind:
$(MAKE) check VG="valgrind --quiet --leak-check=full"
+# This binary must be statically linked. It is used for testing
+# the "guestfs_command" and "guestfs_command_lines" functions.
+
+test_command_SOURCES = test-command.c
+test_command_LDFLAGS = -all-static
+
# Manual pages.
# guestfs-actions.pod and guestfs-structs are autogenerated. There is
# no include mechanism for POD, so we have to do it by hand.
# Manual pages.
# guestfs-actions.pod and guestfs-structs are autogenerated. There is
# no include mechanism for POD, so we have to do it by hand.