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

diff --git a/generator/Makefile.am b/generator/Makefile.am
index 7ef5d9d..a127a87 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -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 \
@@ -44,26 +47,29 @@ SOURCES = \
 	generator_csharp.ml \
 	generator_php.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 +80,20 @@ depend: .depend
 
 include .depend
 
+else
+
+# No OCaml compiler.  Just replace the generator with a script that
+# touches stamp-generator and prints a warning.
+
+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 +107,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