From 1d6f1a9cb0fb1be8467d8e2c0fbda1b7eca70c66 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Sep 2011 14:08:50 +0100 Subject: [PATCH] Move febootstrap into src/ subdirectory. Now we have src/ for febootstrap and helper/ for febootstrap-supermin-helper. --- .gitignore | 4 +- Makefile.am | 88 +----------------- configure.ac | 7 +- .depend => src/.depend | 0 src/Makefile.am | 103 +++++++++++++++++++++ config.ml.in => src/config.ml.in | 0 febootstrap.ml => src/febootstrap.ml | 0 febootstrap.pod => src/febootstrap.pod | 0 .../febootstrap_cmdline.ml | 0 .../febootstrap_cmdline.mli | 0 febootstrap_debian.ml => src/febootstrap_debian.ml | 0 .../febootstrap_package_handlers.ml | 0 .../febootstrap_package_handlers.mli | 0 febootstrap_pacman.ml => src/febootstrap_pacman.ml | 0 febootstrap_utils.ml => src/febootstrap_utils.ml | 0 febootstrap_utils.mli => src/febootstrap_utils.mli | 0 .../febootstrap_yum_rpm.ml | 0 17 files changed, 112 insertions(+), 90 deletions(-) rename .depend => src/.depend (100%) create mode 100644 src/Makefile.am rename config.ml.in => src/config.ml.in (100%) rename febootstrap.ml => src/febootstrap.ml (100%) rename febootstrap.pod => src/febootstrap.pod (100%) rename febootstrap_cmdline.ml => src/febootstrap_cmdline.ml (100%) rename febootstrap_cmdline.mli => src/febootstrap_cmdline.mli (100%) rename febootstrap_debian.ml => src/febootstrap_debian.ml (100%) rename febootstrap_package_handlers.ml => src/febootstrap_package_handlers.ml (100%) rename febootstrap_package_handlers.mli => src/febootstrap_package_handlers.mli (100%) rename febootstrap_pacman.ml => src/febootstrap_pacman.ml (100%) rename febootstrap_utils.ml => src/febootstrap_utils.ml (100%) rename febootstrap_utils.mli => src/febootstrap_utils.mli (100%) rename febootstrap_yum_rpm.ml => src/febootstrap_yum_rpm.ml (100%) 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 similarity index 100% rename from .depend rename to 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 + +# 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 similarity index 100% rename from config.ml.in rename to src/config.ml.in diff --git a/febootstrap.ml b/src/febootstrap.ml similarity index 100% rename from febootstrap.ml rename to src/febootstrap.ml diff --git a/febootstrap.pod b/src/febootstrap.pod similarity index 100% rename from febootstrap.pod rename to src/febootstrap.pod diff --git a/febootstrap_cmdline.ml b/src/febootstrap_cmdline.ml similarity index 100% rename from febootstrap_cmdline.ml rename to src/febootstrap_cmdline.ml diff --git a/febootstrap_cmdline.mli b/src/febootstrap_cmdline.mli similarity index 100% rename from febootstrap_cmdline.mli rename to src/febootstrap_cmdline.mli diff --git a/febootstrap_debian.ml b/src/febootstrap_debian.ml similarity index 100% rename from febootstrap_debian.ml rename to src/febootstrap_debian.ml diff --git a/febootstrap_package_handlers.ml b/src/febootstrap_package_handlers.ml similarity index 100% rename from febootstrap_package_handlers.ml rename to src/febootstrap_package_handlers.ml diff --git a/febootstrap_package_handlers.mli b/src/febootstrap_package_handlers.mli similarity index 100% rename from febootstrap_package_handlers.mli rename to src/febootstrap_package_handlers.mli diff --git a/febootstrap_pacman.ml b/src/febootstrap_pacman.ml similarity index 100% rename from febootstrap_pacman.ml rename to src/febootstrap_pacman.ml diff --git a/febootstrap_utils.ml b/src/febootstrap_utils.ml similarity index 100% rename from febootstrap_utils.ml rename to src/febootstrap_utils.ml diff --git a/febootstrap_utils.mli b/src/febootstrap_utils.mli similarity index 100% rename from febootstrap_utils.mli rename to src/febootstrap_utils.mli diff --git a/febootstrap_yum_rpm.ml b/src/febootstrap_yum_rpm.ml similarity index 100% rename from febootstrap_yum_rpm.ml rename to src/febootstrap_yum_rpm.ml -- 1.8.3.1