[PATCH] add dependency to ensure make-initramfs.sh is rebuilt when (Jim Meyering)

[libguestfs.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am

index c0c2ebb..47ef6d0 100644 (file)
--- 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 \
@@ -49,7 +52,9 @@ EXTRA_DIST = \
         recipes/README \
         recipes/*.html \
         recipes/*.sh \
-       recipes/*.example
+       recipes/*.example \
+       html/recipes.css \
+       make-recipes.sh
  
  # Build the root filesystem.
  # Currently this is arch-dependent, so it seems like putting it in
@@ -68,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
@@ -141,38 +149,16 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
           --outfile $@
  
  # Recipes web page.
-html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile
+html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
         rm -f $@ $@-t
-       echo '<html><head><title>guestfish recipes</title>' >> $@-t; \
-       echo '<link rel="stylesheet" href="http://et.redhat.com/~rjones/css/standard.css" type="text/css" title="Standard"/>' >> $@-t; \
-       echo '<link rel="stylesheet" href="http://et.redhat.com/~rjones/css/numbering.css" type="text/css" title="Standard"/>' >> $@-t; \
-       echo '<link rel="alternate stylesheet" href="http://et.redhat.com/~rjones/css/easytoread.css" type="text/css" title="High contrast, big fonts"/>' >> $@-t; \
-       echo '</head><body>' >> $@-t; \
-       echo '<h1>guestfish recipes</h1>' >> $@-t; \
-       echo '<p>You can also find these in the <code>recipes/</code> subdirectory of the source.</p>' >> $@-t; \
-       for f in recipes/*.sh; do \
-         b=`basename $$f .sh`; \
-         echo -n '<a name="'$$b'"></a>' >> $@-t; \
-         if [ -r recipes/$$b.html ]; then \
-           cat recipes/$$b.html >> $@-t; \
-         else \
-           echo '<h2>$$b</h2>' >> $@-t; \
-         fi; \
-         echo '<pre>' >> $@-t; \
-         sed -e 's,&,\&amp;,g' -e 's,<,\&lt;,g' -e 's,>,\&gt;,g' < $$f >> $@-t; \
-         echo '</pre>' >> $@-t; \
-         if [ -r recipes/$$b.example ]; then \
-           echo '<h3>Example output</h3>' >> $@-t; \
-           echo '<pre>' >> $@-t; \
-           sed -e 's,&,\&amp;,g' -e 's,<,\&lt;,g' -e 's,>,\&gt;,g' < recipes/$$b.example >> $@-t; \
-           echo '</pre>' >> $@-t; \
-         fi; \
-       done; \
-       echo '</body></html>' >> $@-t; \
+       sh make-recipes.sh recipes/*.sh > $@-t
         mv $@-t $@
  
-website: html/guestfs.3.html html/guestfish.1.html html/recipes.html
-       cp $^ html/pod.css $(HOME)/d/redhat/et-website/libguestfs/
+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.
  
@@ -215,7 +201,7 @@ test-boot-realistic: emptydisk
  
  # Make clean.
  
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~ recipes/*~
  
  clean-local:
         rm -rf initramfs