X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator%2FMakefile.am;h=d6120e350e3aeb31def93d473e38ac06942e380e;hb=c55bad93fbde03a3daa6058913f02098c45e55f5;hp=469265b66e43b08a4588877d17fef25ac92b3a10;hpb=d859c283c469b9d9124d90d0ac32024671372ed5;p=libguestfs.git

diff --git a/generator/Makefile.am b/generator/Makefile.am
index 469265b..d6120e3 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 \
@@ -43,6 +46,7 @@ SOURCES = \
 	generator_haskell.ml \
 	generator_csharp.ml \
 	generator_php.ml \
+	generator_erlang.ml \
 	generator_bindtests.ml \
 	generator_errnostring.ml \
 	generator_main.ml
@@ -50,23 +54,23 @@ SOURCES = \
 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
 
 if HAVE_OCAML
 
-generator: $(OBJECTS)
-	$(OCAMLC) -o generator $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OBJECTS)
+$(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
 
@@ -82,7 +86,7 @@ else
 # No OCaml compiler.  Just replace the generator with a script that
 # touches stamp-generator and prints a warning.
 
-generator: $(SOURCES)
+$(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