git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Fix automake warnings
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
9ae5217
..
d14cc12
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-19,8
+19,11
@@
include $(top_srcdir)/subdir-rules.mk
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
+# Gnulib - must be built and tested before the library.
+SUBDIRS = gnulib/lib gnulib/tests
+
# Basic source for the library.
# Basic source for the library.
-SUBDIRS
= gnulib/lib images
generator src examples po
+SUBDIRS
+= tests/data
generator src examples po
if ENABLE_DAEMON
SUBDIRS += daemon
if ENABLE_DAEMON
SUBDIRS += daemon
@@
-29,11
+32,21
@@
if ENABLE_APPLIANCE
SUBDIRS += appliance
endif
SUBDIRS += appliance
endif
-# Tests and the test-tool.
-SUBDIRS += gnulib/tests tests/c-api tests/qemu
-SUBDIRS += tests/protocol tests/lvm tests/luks tests/md
+# Tests - order is important.
+SUBDIRS += tests/qemu
+SUBDIRS += tests/guests
+SUBDIRS += tests/c-api
+SUBDIRS += tests/protocol
+SUBDIRS += tests/lvm
+SUBDIRS += tests/luks
+SUBDIRS += tests/md
SUBDIRS += tests/regressions
SUBDIRS += tests/regressions
-SUBDIRS += tests/extra test-tool
+
+# Extra tests don't run by default. You have to do 'make extra-tests'.
+SUBDIRS += tests/extra
+
+# libguestfs-test-tool
+SUBDIRS += test-tool
# Guestfish.
SUBDIRS += fish
# Guestfish.
SUBDIRS += fish
@@
-208,7
+221,7
@@
dist-hook:
$(top_srcdir)/update-bugs.sh > BUGS-t
mv BUGS-t BUGS
cp BUGS $(distdir)/BUGS
$(top_srcdir)/update-bugs.sh > BUGS-t
mv BUGS-t BUGS
cp BUGS $(distdir)/BUGS
- git log --pretty="format:%an
" | sort -u
| \
+ git log --pretty="format:%an
<%ae>" | sort -u | uniq -w 10
| \
grep -v rjones | \
grep -v "Richard Jones" \
> AUTHORS-t
grep -v rjones | \
grep -v "Richard Jones" \
> AUTHORS-t