[Pkg-libvirt-commits] [libguestfs] 36/61: customize: Rename main.ml to customize_main.ml.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit cec31436f8b87d84887a50fd6eeba853ccef1581
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Mar 25 22:41:19 2014 +0000

    customize: Rename main.ml to customize_main.ml.
    
    The OCaml compiler isn't happy when two modules have the same name in
    different directories.  Since customize/ contains a library of modules
    used in other directories, and since those directories may have
    main.ml files too, we need to rename 'customize/main.ml' to
    'customize/customize_main.ml'.
---
 customize/Makefile.am                    | 4 ++--
 customize/{main.ml => customize_main.ml} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/customize/Makefile.am b/customize/Makefile.am
index 2747add..ae1e007 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -46,7 +46,7 @@ SOURCES = \
 	firstboot.mli \
 	hostname.ml \
 	hostname.mli \
-	main.ml \
+	customize_main.ml \
 	password.ml \
 	password.mli \
 	perl_edit.ml \
@@ -87,7 +87,7 @@ ocaml_modules = \
 	timezone \
 	customize_cmdline \
 	customize_run \
-	main
+	customize_main
 
 if HAVE_OCAMLOPT
 OBJECTS += $(patsubst %,%.cmx,$(ocaml_modules))
diff --git a/customize/main.ml b/customize/customize_main.ml
similarity index 100%
rename from customize/main.ml
rename to customize/customize_main.ml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git