X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=generator%2FMakefile.am;h=dfa5893481148a55271c96bc5e6c2d49424244af;hp=7ef5d9db429f99cf69e6c951e8d74234f458402b;hb=5d93d70b4d36b2337104b3dbca07722fa4d47ff5;hpb=04d8209077d2227eb1d42695ba71147f78987050

diff --git a/generator/Makefile.am b/generator/Makefile.am
index 7ef5d9d..dfa5893 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2010 Red Hat Inc.
+# Copyright (C) 2010-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
@@ -13,7 +13,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 SOURCES = \
 	generator_types.ml \
@@ -23,9 +23,12 @@ SOURCES = \
 	generator_actions.ml \
 	generator_structs.mli \
 	generator_structs.ml \
+	generator_api_versions.mli \
+	generator_api_versions.ml \
 	generator_optgroups.ml \
 	generator_prepopts.mli \
 	generator_prepopts.ml \
+	generator_events.ml \
 	generator_pr.mli \
 	generator_pr.ml \
 	generator_docstrings.ml \
@@ -33,7 +36,7 @@ SOURCES = \
 	generator_c.ml \
 	generator_xdr.ml \
 	generator_daemon.ml \
-	generator_capitests.ml \
+	generator_tests_c_api.ml \
 	generator_fish.ml \
 	generator_ocaml.ml \
 	generator_perl.ml \
@@ -43,27 +46,31 @@ SOURCES = \
 	generator_haskell.ml \
 	generator_csharp.ml \
 	generator_php.ml \
+	generator_erlang.ml \
 	generator_bindtests.ml \
+	generator_errnostring.ml \
 	generator_main.ml
 
 SOURCES_ML = $(filter %.ml,$(SOURCES))
 OBJECTS = $(SOURCES_ML:.ml=.cmo)
 
-EXTRA_DIST = $(SOURCES)
+EXTRA_DIST = $(SOURCES) files-generated.txt
 
-OCAMLCFLAGS = -I +xml-light -I +../pkg-lib/xml-light
-OCAMLCLIBS = xml-light.cma unix.cma str.cma
+OCAMLCFLAGS = -warn-error CDEFLMPSUVYZX
+OCAMLCLIBS = unix.cma str.cma
 
 noinst_PROGRAM = generator
 
-generator: $(OBJECTS) ../images/test.iso
-	$(OCAMLC) -o generator $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OBJECTS)
+if HAVE_OCAML
+
+$(srcdir)/generator: $(OBJECTS)
+	$(OCAMLC) -I $(srcdir) -o $@ $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OBJECTS)
 
 .ml.cmo:
-	$(OCAMLC) $(OCAMLCFLAGS) -c $< -o $@
+	$(OCAMLC) -I $(srcdir) $(OCAMLCFLAGS) -c $< -o $@
 
 .mli.cmi:
-	$(OCAMLC) $(OCAMLCFLAGS) -c $< -o $@
+	$(OCAMLC) -I $(srcdir) $(OCAMLCFLAGS) -c $< -o $@
 
 depend: .depend
 
@@ -74,6 +81,20 @@ depend: .depend
 
 include .depend
 
+else
+
+# No OCaml compiler.  Just replace the generator with a script that
+# touches stamp-generator and prints a warning.
+
+$(srcdir)/generator: $(SOURCES)
+	rm -f $@ $@-t
+	echo 'echo Warning: Install OCaml compiler in order to rebuild the generated files.' >> $@-t
+	echo 'touch generator/stamp-generator' >> $@-t
+	chmod +x $@-t
+	mv $@-t $@
+
+endif
+
 noinst_DATA = stamp-generator
 
 # Run the generator.
@@ -87,9 +108,6 @@ stamp-generator: generator
 	mkdir -p $(top_srcdir)/csharp
 	cd $(top_srcdir) && generator/generator
 
-../images/test.iso:
-	make -C ../images test.iso
-
 CLEANFILES = $(noinst_DATA) $(noinst_PROGRAM) *.cmi *.cmo *~
 
 SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly