X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=generator%2FMakefile.am;h=dfa5893481148a55271c96bc5e6c2d49424244af;hp=112fc69517a21ab199abe9206d42652bc4299820;hb=5d93d70b4d36b2337104b3dbca07722fa4d47ff5;hpb=4e0cf4dbf8a8a96288f70114fdc3939da0aa7ad1

diff --git a/generator/Makefile.am b/generator/Makefile.am
index 112fc69..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 \
@@ -36,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 \
@@ -46,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
@@ -62,14 +63,14 @@ 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
 
@@ -85,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