diff options
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | helper/Makefile.am | 46 | ||||
| -rw-r--r-- | helper/febootstrap-supermin-helper.pod (renamed from febootstrap-supermin-helper.pod) | 0 | ||||
| -rw-r--r-- | helper/main.c (renamed from febootstrap-supermin-helper.c) | 0 |
5 files changed, 49 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index bb3b505..02bc3f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = lib examples +SUBDIRS = lib helper examples bin_SCRIPTS = \ febootstrap \ @@ -28,8 +28,6 @@ bin_SCRIPTS = \ febootstrap-minimize \ febootstrap-to-initramfs \ febootstrap-to-supermin -bin_PROGRAMS = \ - febootstrap-supermin-helper DISTCLEANFILES = $(bin_SCRIPTS) febootstrap: febootstrap.sh @@ -68,18 +66,13 @@ febootstrap-to-supermin: febootstrap-to-supermin.sh chmod 0555 $@-t mv $@-t $@ -febootstrap_supermin_helper_SOURCES = febootstrap-supermin-helper.c -febootstrap_supermin_helper_CFLAGS = -Wall -Ilib -febootstrap_supermin_helper_LDADD = $(LTLIBINTL) -Llib -lgnu - 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 @@ -143,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 = \ @@ -173,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 \ m4/gnulib-cache.m4 diff --git a/configure.ac b/configure.ac index 05597b1..1a94700 100644 --- a/configure.ac +++ b/configure.ac @@ -59,5 +59,5 @@ if test "x$YUM" = "xno" ; then fi AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([lib/Makefile Makefile examples/Makefile]) +AC_CONFIG_FILES([Makefile lib/Makefile helper/Makefile examples/Makefile]) AC_OUTPUT diff --git a/helper/Makefile.am b/helper/Makefile.am new file mode 100644 index 0000000..66d5b49 --- /dev/null +++ b/helper/Makefile.am @@ -0,0 +1,46 @@ +# febootstrap Makefile.am +# (C) Copyright 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# Written by Richard W.M. Jones <rjones@redhat.com> + +bin_PROGRAMS = \ + febootstrap-supermin-helper + +febootstrap_supermin_helper_SOURCES = main.c +febootstrap_supermin_helper_CFLAGS = -Wall -I../lib +febootstrap_supermin_helper_LDADD = $(LTLIBINTL) -L../lib -lgnu + +man_MANS = \ + febootstrap-supermin-helper.8 + +if HAVE_PERLDOC + +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 = \ + febootstrap-supermin-helper.8 febootstrap-supermin-helper.txt \ + febootstrap-supermin-helper.pod diff --git a/febootstrap-supermin-helper.pod b/helper/febootstrap-supermin-helper.pod index 29f4b95..29f4b95 100644 --- a/febootstrap-supermin-helper.pod +++ b/helper/febootstrap-supermin-helper.pod diff --git a/febootstrap-supermin-helper.c b/helper/main.c index a81cf61..a81cf61 100644 --- a/febootstrap-supermin-helper.c +++ b/helper/main.c |