Update gnulib.

[febootstrap.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 861b5e0..02bc3f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # febootstrap Makefile.am
-# (C) Copyright 2009 Red Hat Inc.
+# (C) Copyright 2009-2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,9 @@
 #
 # Written by Richard W.M. Jones <rjones@redhat.com>
 
-SUBDIRS = examples
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = lib helper examples
 
 bin_SCRIPTS = \
        febootstrap \
@@ -25,8 +27,7 @@ bin_SCRIPTS = \
        febootstrap-install \
        febootstrap-minimize \
        febootstrap-to-initramfs \
-       febootstrap-to-supermin \
-       febootstrap-supermin-helper
+       febootstrap-to-supermin
 DISTCLEANFILES = $(bin_SCRIPTS)
 
 febootstrap: febootstrap.sh
@@ -65,20 +66,13 @@ febootstrap-to-supermin: febootstrap-to-supermin.sh
        chmod 0555 $@-t
        mv $@-t $@
 
-febootstrap-supermin-helper: febootstrap-supermin-helper.sh
-       rm -f $@
-       cp $< $@-t
-       chmod 0555 $@-t
-       mv $@-t $@
-
 man_MANS = \
        febootstrap.8 \
        febootstrap-run.8 \
        febootstrap-install.8 \
        febootstrap-minimize.8 \
        febootstrap-to-initramfs.8 \
-       febootstrap-to-supermin.8 \
-       febootstrap-supermin-helper.8
+       febootstrap-to-supermin.8
 
 if HAVE_PERLDOC
 
@@ -142,16 +136,6 @@ febootstrap-to-supermin.8: febootstrap-to-supermin.pod
 febootstrap-to-supermin.txt: febootstrap-to-supermin.pod
        pod2text $< > $@
 
-febootstrap-supermin-helper.8: febootstrap-supermin-helper.pod
-       pod2man \
-         --section 8 \
-         -c "Virtualization Support" \
-         --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-         $< > $@
-
-febootstrap-supermin-helper.txt: febootstrap-supermin-helper.pod
-       pod2text $< > $@
-
 endif
 
 EXTRA_DIST = \
@@ -172,6 +156,4 @@ EXTRA_DIST = \
        febootstrap-to-supermin.8 febootstrap-to-supermin.txt \
          febootstrap-to-supermin.pod \
          febootstrap-to-supermin.sh \
-       febootstrap-supermin-helper.8 febootstrap-supermin-helper.txt \
-         febootstrap-supermin-helper.pod \
-         febootstrap-supermin-helper.sh
+       m4/gnulib-cache.m4