X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=2286dd5d8db8ec25026afee364e50fd1db79b231;hp=f6289e47c8cda9309e61da33cd6a4ff87d32cd21;hb=77c3f9d0ed25218fc3f24cee083a2083157d8e0a;hpb=7e7b2d30b13c2daad59995c06392cb4b24ffa9e6

diff --git a/Makefile.am b/Makefile.am
index f6289e4..2286dd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,15 @@ endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
+if HAVE_RUBY
+SUBDIRS += ruby
+endif
+if HAVE_JAVA
+SUBDIRS += java
+endif
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
 
 EXTRA_DIST = \
 	make-initramfs.sh update-initramfs.sh \
@@ -36,7 +45,17 @@ EXTRA_DIST = \
 	libguestfs.spec \
 	html/pod.css \
 	HACKING TODO \
-	tests.c
+	tests.c \
+	libguestfs.pc libguestfs.pc.in \
+	gitlog-to-changelog \
+	recipes/LICENSE \
+	recipes/README \
+	recipes/*.html \
+	recipes/*.sh \
+	recipes/*.example \
+	html/recipes.css \
+	make-recipes.sh \
+	test-cleanup.sh
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -55,13 +74,16 @@ $(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
 initramfs/fakeroot.log: make-initramfs.sh.in
 	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
 	-mv $(VMLINUZ) $(VMLINUZ).bak
-	if ! bash $(builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
+	if ! bash $(top_builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
 
 $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 	rm -f $@
-	bash $(builddir)/update-initramfs.sh
+	bash $(top_builddir)/update-initramfs.sh
 	touch $@
 
+make-initramfs.sh: make-initramfs.sh.in
+	./config.status $@
+
 # Tests.  These are auto-generated from the test descriptions.
 
 check_PROGRAMS = tests
@@ -127,8 +149,28 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
 	  --htmldir html \
 	  --outfile $@
 
-website: html/guestfs.3.html html/guestfish.1.html
-	cp $^ html/pod.css $(HOME)/d/redhat/et-website/libguestfs/
+# Recipes web page.
+html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
+	rm -f $@ $@-t
+	sh make-recipes.sh recipes/*.sh > $@-t
+	mv $@-t $@
+
+website: html/guestfs.3.html html/guestfish.1.html \
+	html/virt-inspector.1.html \
+	html/recipes.html
+	cp $^ html/pod.css html/recipes.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.
 
@@ -156,11 +198,11 @@ test-boot-realistic: emptydisk
 	  -serial stdio \
 	  -net channel,6666:unix:/tmp/sock,server,nowait \
 	  -net user,vlan=0 \
-	  -net nic,vlan=0
+	  -net nic,model=virtio,vlan=0
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
 
 clean-local:
 	rm -rf initramfs