X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=generator%2FMakefile.am;h=44c0594cf6bbf9668c7649eaa3ca82d1e4367d8e;hp=b9fcfb94f3d080ec2e285a03ccdd125d1c057499;hb=e2249b7ce1dd0a2f8f110e0e47aca397185a6373;hpb=f6c4026f85fa6ded33a51ec2757abda9f116fd5f

diff --git a/generator/Makefile.am b/generator/Makefile.am
index b9fcfb9..44c0594 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
@@ -28,6 +28,7 @@ SOURCES = \
 	generator_optgroups.ml \
 	generator_prepopts.mli \
 	generator_prepopts.ml \
+	generator_events.ml \
 	generator_pr.mli \
 	generator_pr.ml \
 	generator_docstrings.ml \
@@ -45,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
@@ -52,7 +54,7 @@ SOURCES = \
 SOURCES_ML = $(filter %.ml,$(SOURCES))
 OBJECTS = $(SOURCES_ML:.ml=.cmo)
 
-EXTRA_DIST = $(SOURCES)
+EXTRA_DIST = $(SOURCES) files-generated.txt
 
 OCAMLCFLAGS = -warn-error CDEFLMPSUVYZX
 OCAMLCLIBS = unix.cma str.cma
@@ -61,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
 
@@ -84,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