X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=f2f26e70e5ae8675dadf3a468aa6822bc926fe48;hp=a3992a658005e2a52ad941153a9791d7d76d1d8a;hb=41b959fd9b057354f642d84398b875d02b88b864;hpb=a8d25362435121ada85656c08cd79642f79f9f7b

diff --git a/Makefile.am b/Makefile.am
index a3992a6..f2f26e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,9 @@ endif
 if HAVE_JAVA
 SUBDIRS += java
 endif
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
 
 EXTRA_DIST = \
 	make-initramfs.sh update-initramfs.sh \
@@ -43,7 +46,15 @@ EXTRA_DIST = \
 	html/pod.css \
 	HACKING TODO \
 	tests.c \
-	libguestfs.pc libguestfs.pc.in
+	libguestfs.pc libguestfs.pc.in \
+	gitlog-to-changelog \
+	recipes/LICENSE \
+	recipes/README \
+	recipes/*.html \
+	recipes/*.sh \
+	recipes/*.example \
+	html/recipes.css \
+	make-recipes.sh
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -62,13 +73,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
@@ -134,8 +148,23 @@ 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.
 
@@ -172,7 +201,7 @@ test-boot-realistic: emptydisk
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
 
 clean-local:
 	rm -rf initramfs