From 96dc3423bc3675797f59c7b582110845ce7a8bf6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 21 Feb 2012 08:48:17 +0000
Subject: [PATCH] Fix parsing tests.

---
 tests/parsing/Makefile.am | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/parsing/Makefile.am b/tests/parsing/Makefile.am
index 9a693a6..bf83ab8 100644
--- a/tests/parsing/Makefile.am
+++ b/tests/parsing/Makefile.am
@@ -22,25 +22,22 @@ check_SCRIPTS = test_load $(tests)
 TESTS_ENVIRONMENT = ./test_load
 TESTS = $(tests)
 
-OCAMLPACKAGES = -package unix,camlp4.lib
+OCAMLPACKAGES = -package unix,num,camlp4.lib,calendar,rpc -I ../../lib
 
-OCAMLCFLAGS = \
-	-g -warn-error CDEFLMPSUVYZX \
-	-I +camlp4 -I ../../daemon \
-	$(OCAMLPACKAGES)
+OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
-PP = -pp '$(CAMLP4O) ../../daemon/pa_when.cmo'
+PP = -pp '$(CAMLP4O) ../../lib/pa_when.cmo'
 
-test_load: test_load.cmo
+test_load: test_load.cmo ../../lib/whenlib.cma
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -linkpkg whenlib.cma $< -o $@
 
 # Rules for all OCaml files.
-%.cmi: %.mli ../../daemon/pa_when.cmo
+%.cmi: %.mli ../../lib/pa_when.cmo ../../lib/whenlib.cma
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) -c $< -o $@
-%.cmo: %.ml ../../daemon/pa_when.cmo
+%.cmo: %.ml ../../lib/pa_when.cmo ../../lib/whenlib.cma
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) -c $< -o $@
-#%.cmx: %.ml ../../daemon/pa_when.cmo
+#%.cmx: %.ml ../../lib/pa_when.cmo ../../lib/whenlib.cma
 #	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(PP) -c $< -o $@
 
 SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
@@ -63,7 +60,7 @@ print:
 	@for f in $(check_SCRIPTS); do \
 	  b=`basename $$f .cmo`; \
 	  echo "Test: $$b.ml"; \
-	  camlp4o ../../daemon/pa_when.cmo -printer pr_o.cmo $$b.ml; \
+	  camlp4o ../../lib/pa_when.cmo -printer pr_o.cmo $$b.ml; \
 	done
 
 CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *~ test_load
-- 
1.8.3.1