From 0e4f253777af9b8aa7c3107d71dfbb061172a53e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 21 Feb 2012 10:43:34 +0000
Subject: [PATCH 1/1] pa_when does not need and shouldn't depend on whenlib.cma
 or any other libraries.

---
 lib/Makefile.am | 9 ++++++---
 lib/pa_when.ml  | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 898f204..5ab4128 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -55,9 +55,12 @@ whenproto_aux.ml whenproto_aux.mli: whenproto.x
 	$(OCAMLRPCGEN) -int int32 -hyper int64 -aux $<
 
 # Preprocessor for whenjobs files.
-pa_when.cmo: pa_when.ml whenlib.cma
-	$(OCAMLFIND) c $(OCAMLCFLAGS) \
-	  -linkpkg whenlib.cma -pp $(CAMLP4OF) -c $< -o $@
+# Note that we intentionally don't want this to depend on any
+# libraries except for camlp4.lib.
+pa_when.cmo: pa_when.ml
+	$(OCAMLFIND) c -g -warn-error CDEFLMPSUVYZX \
+	  -package camlp4.lib -linkpkg \
+	  -pp $(CAMLP4OF) -c $< -o $@
 
 # Rules for all OCaml files.
 %.cmi: %.mli
diff --git a/lib/pa_when.ml b/lib/pa_when.ml
index d646822..3b8f36e 100644
--- a/lib/pa_when.ml
+++ b/lib/pa_when.ml
@@ -29,8 +29,6 @@ open Camlp4.PreCast
 open Syntax
 open Ast
 
-open Whenutils
-
 let unique = let i = ref 0 in fun () -> incr i; !i
 
 let unique_job_name () = sprintf "job$%d" (unique ())
-- 
1.8.3.1