Move febootstrap into src/ subdirectory.

Now we have src/ for febootstrap and helper/ for
febootstrap-supermin-helper.

17 files changed, 112 insertions, 90 deletions

diff --git a/.gitignore b/.gitignore
index bfb6c08..22f33b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,13 +17,11 @@ config.guess
 config.h.in
 config.h
 config.log
-config.ml
 config.status
 config.sub
 configure
 cscope.out
 depcomp
-febootstrap
 febootstrap*.8
 febootstrap*.txt
 febootstrap-*.tar.gz
@@ -50,6 +48,8 @@ INSTALL
 install-sh
 missing
 pod2htm?.tmp
+src/config.ml
+src/febootstrap
 stamp-h1
 /warn-on-use.h
 examples/guestfs
diff --git a/Makefile.am b/Makefile.am
index 7ac5079..c40c769 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # febootstrap Makefile.am
-# (C) Copyright 2009-2010 Red Hat Inc.
+# (C) Copyright 2009-2011 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
@@ -19,98 +19,16 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib helper
-
-# Note these must be in build dependency order.
-SOURCES = \
-	config.ml \
-	febootstrap_cmdline.mli \
-	febootstrap_cmdline.ml \
-	febootstrap_utils.mli \
-	febootstrap_utils.ml \
-	febootstrap_package_handlers.mli \
-	febootstrap_package_handlers.ml \
-	febootstrap_yum_rpm.ml \
-	febootstrap_debian.ml \
-	febootstrap_pacman.ml \
-	febootstrap.ml
-
-CLEANFILES = *~ *.cmi *.cmo *.cmx *.o febootstrap
+SUBDIRS = lib src helper
 
 EXTRA_DIST = \
 	.gitignore \
 	.gitmodules \
 	autogen.sh \
-	febootstrap.8 \
-	febootstrap.pod \
 	html/pod.css \
 	m4/gnulib-cache.m4 \
 	$(SOURCES)
 
-man_MANS = \
-	febootstrap.8
-
-bin_SCRIPTS = febootstrap
-
-SOURCES_ML = $(filter %.ml,$(SOURCES))
-BOBJECTS = $(SOURCES_ML:.ml=.cmo)
-XOBJECTS = $(SOURCES_ML:.ml=.cmx)
-
-if !HAVE_OCAMLOPT
-OBJECTS = $(BOBJECTS)
-BEST    = c
-else
-OBJECTS = $(XOBJECTS)
-BEST    = opt
-endif
-
-OCAMLPACKAGES = -package unix,str
-OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ
-
-febootstrap: $(OBJECTS)
-	$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg \
-	  $^ -o $@
-
-.mli.cmi:
-	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
-.ml.cmo:
-	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
-.ml.cmx:
-	$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
-
-depend: .depend
-
-.depend: $(SOURCES)
-	rm -f $@ $@-t
-	$(OCAMLFIND) ocamldep $^ > $@-t
-	mv $@-t $@
-
-include .depend
-
-SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
-
-if HAVE_PERLDOC
-
-febootstrap.8: febootstrap.pod
-	pod2man \
-	  --section 8 \
-	  -c "Virtualization Support" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  $< > $@
-
-noinst_DATA = \
-	html/febootstrap.8.html
-
-html/febootstrap.8.html: febootstrap.pod
-	mkdir -p html
-	pod2html \
-	  --css 'pod.css' \
-	  --htmldir html \
-	  --outfile html/febootstrap.8.html \
-	  febootstrap.pod
-
-endif
-
 # Maintainer website update.
 HTMLFILES = \
 	html/febootstrap.8.html \
@@ -121,4 +39,4 @@ WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 website: $(HTMLFILES)
 	cp $(HTMLFILES) $(WEBSITEDIR)
 
-CLEANFILES += $(HTMLFILES) pod2*.tmp
+CLEANFILES = $(HTMLFILES) pod2*.tmp
diff --git a/configure.ac b/configure.ac
index fdcef28..438c549 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,9 +114,10 @@ if test "x$GAWK" = "xno" ; then
 fi
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([config.ml
+AC_CONFIG_FILES([Makefile
         debian/changelog
-        Makefile
+        helper/Makefile
         lib/Makefile
-        helper/Makefile])
+        src/config.ml
+        src/Makefile])
 AC_OUTPUT
diff --git a/.depend b/src/.depend
index e71f272..e71f272 100644
--- a/.depend
+++ b/src/.depend
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..b715c9f
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,103 @@
+# febootstrap Makefile.am
+# (C) Copyright 2009-2011 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>
+
+# Note these must be in build dependency order.
+SOURCES = \
+	config.ml \
+	febootstrap_cmdline.mli \
+	febootstrap_cmdline.ml \
+	febootstrap_utils.mli \
+	febootstrap_utils.ml \
+	febootstrap_package_handlers.mli \
+	febootstrap_package_handlers.ml \
+	febootstrap_yum_rpm.ml \
+	febootstrap_debian.ml \
+	febootstrap_pacman.ml \
+	febootstrap.ml
+
+CLEANFILES = *~ *.cmi *.cmo *.cmx *.o febootstrap
+
+EXTRA_DIST = \
+	febootstrap.8 \
+	febootstrap.pod \
+	$(SOURCES)
+
+man_MANS = \
+	febootstrap.8
+
+bin_SCRIPTS = febootstrap
+
+SOURCES_ML = $(filter %.ml,$(SOURCES))
+BOBJECTS = $(SOURCES_ML:.ml=.cmo)
+XOBJECTS = $(SOURCES_ML:.ml=.cmx)
+
+if !HAVE_OCAMLOPT
+OBJECTS = $(BOBJECTS)
+BEST    = c
+else
+OBJECTS = $(XOBJECTS)
+BEST    = opt
+endif
+
+OCAMLPACKAGES = -package unix,str
+OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ
+
+febootstrap: $(OBJECTS)
+	$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg \
+	  $^ -o $@
+
+.mli.cmi:
+	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+.ml.cmo:
+	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+.ml.cmx:
+	$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+
+depend: .depend
+
+.depend: $(SOURCES)
+	rm -f $@ $@-t
+	$(OCAMLFIND) ocamldep $^ > $@-t
+	mv $@-t $@
+
+include .depend
+
+SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
+
+if HAVE_PERLDOC
+
+febootstrap.8: febootstrap.pod
+	pod2man \
+	  --section 8 \
+	  -c "Virtualization Support" \
+	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
+	  $< > $@
+
+noinst_DATA = \
+	../html/febootstrap.8.html
+
+../html/febootstrap.8.html: febootstrap.pod
+	mkdir -p ../html
+	pod2html \
+	  --css 'pod.css' \
+	  --htmldir ../html \
+	  --outfile ../html/febootstrap.8.html \
+	  febootstrap.pod
+
+endif
diff --git a/config.ml.in b/src/config.ml.in
index 26a8e3d..26a8e3d 100644
--- a/config.ml.in
+++ b/src/config.ml.in
diff --git a/febootstrap.ml b/src/febootstrap.ml
index 7e48206..7e48206 100644
--- a/febootstrap.ml
+++ b/src/febootstrap.ml
diff --git a/febootstrap.pod b/src/febootstrap.pod
index ac97f48..ac97f48 100644
--- a/febootstrap.pod
+++ b/src/febootstrap.pod
diff --git a/febootstrap_cmdline.ml b/src/febootstrap_cmdline.ml
index 667e297..667e297 100644
--- a/febootstrap_cmdline.ml
+++ b/src/febootstrap_cmdline.ml
diff --git a/febootstrap_cmdline.mli b/src/febootstrap_cmdline.mli
index d948d80..d948d80 100644
--- a/febootstrap_cmdline.mli
+++ b/src/febootstrap_cmdline.mli
diff --git a/febootstrap_debian.ml b/src/febootstrap_debian.ml
index 23f3593..23f3593 100644
--- a/febootstrap_debian.ml
+++ b/src/febootstrap_debian.ml
diff --git a/febootstrap_package_handlers.ml b/src/febootstrap_package_handlers.ml
index ad3a233..ad3a233 100644
--- a/febootstrap_package_handlers.ml
+++ b/src/febootstrap_package_handlers.ml
diff --git a/febootstrap_package_handlers.mli b/src/febootstrap_package_handlers.mli
index c28d81f..c28d81f 100644
--- a/febootstrap_package_handlers.mli
+++ b/src/febootstrap_package_handlers.mli
diff --git a/febootstrap_pacman.ml b/src/febootstrap_pacman.ml
index 6691ebe..6691ebe 100644
--- a/febootstrap_pacman.ml
+++ b/src/febootstrap_pacman.ml
diff --git a/febootstrap_utils.ml b/src/febootstrap_utils.ml
index 2265753..2265753 100644
--- a/febootstrap_utils.ml
+++ b/src/febootstrap_utils.ml
diff --git a/febootstrap_utils.mli b/src/febootstrap_utils.mli
index 3087ee0..3087ee0 100644
--- a/febootstrap_utils.mli
+++ b/src/febootstrap_utils.mli
diff --git a/febootstrap_yum_rpm.ml b/src/febootstrap_yum_rpm.ml
index ca74f4a..ca74f4a 100644
--- a/febootstrap_yum_rpm.ml
+++ b/src/febootstrap_yum_rpm.ml