[Libguestfs] [PATCH 1/3] generator: Use common OCaml rules for building the generator too.

[Richard W.M. Jones]

Updates commit a3cb12ab2c1eb323647cc598ab166181aa98545c.
---
 generator/Makefile.am | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/generator/Makefile.am b/generator/Makefile.am
index ab6e059..393c566 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -116,23 +116,17 @@ objects = \
 
 EXTRA_DIST = $(sources) files-generated.txt
 
-OCAMLCFLAGS = $(OCAML_WARN_ERROR) -I $(srcdir) -I . -package unix,str
+OCAMLPACKAGES = -package unix,str -I $(srcdir) -I .
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
 
 noinst_PROGRAM = generator
 
 if HAVE_OCAML
 
 generator: $(objects)
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -linkpkg $^ -o $@
+	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg $^ -o $@
 
 # Dependencies.
-%.cmi: %.mli
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
-%.cmi: %.ml
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
-%.cmo: %.ml
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
-
 depend: .depend
 
 .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
-- 
2.7.4