X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=1b5ea897cdd925a69a3ec9cc95aeed99f0239fe7;hb=56826a0dc9533cb1d7d227c5a2f70d8d31a4dd8f;hp=f2cb9d93d88a967af83bda84052e52a5e7f4aea6;hpb=c989e8832df70b4cb8200ba8d5622048e560f1f7;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index f2cb9d9..1b5ea89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,12 @@ endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
+if HAVE_RUBY
+SUBDIRS += ruby
+endif
+if HAVE_JAVA
+SUBDIRS += java
+endif
 
 EXTRA_DIST = \
 	make-initramfs.sh update-initramfs.sh \
@@ -35,7 +41,10 @@ EXTRA_DIST = \
 	guestfish.pod guestfish-actions.pod \
 	libguestfs.spec \
 	html/pod.css \
-	HACKING
+	HACKING TODO \
+	tests.c \
+	libguestfs.pc libguestfs.pc.in \
+	gitlog-to-changelog
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -61,6 +70,19 @@ $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 	bash $(builddir)/update-initramfs.sh
 	touch $@
 
+# Tests.  These are auto-generated from the test descriptions.
+
+check_PROGRAMS = tests
+
+tests_SOURCES = tests.c
+tests_CFLAGS = \
+	-I$(top_builddir)/src -Wall
+tests_LDADD = $(top_builddir)/src/libguestfs.la
+
+TESTS = $(check_PROGRAMS)
+
+$(TESTS): $(INITRAMFS) $(VMLINUZ)
+
 # 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.
@@ -116,6 +138,17 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
 website: html/guestfs.3.html html/guestfish.1.html
 	cp $^ html/pod.css $(HOME)/d/redhat/et-website/libguestfs/
 
+# Generate the ChangeLog automatically from the gitlog.
+
+dist-hook:
+	./gitlog-to-changelog > ChangeLog
+	cp ChangeLog $(distdir)/ChangeLog
+
+# Pkgconfig.
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libguestfs.pc
+
 # Test-boot the image.
 
 test-boot: emptydisk
@@ -146,7 +179,7 @@ test-boot-realistic: emptydisk
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~
 
 clean-local:
 	rm -rf initramfs