pa_when does not need and shouldn't depend on whenlib.cma
authorRichard W.M. Jones <rjones@redhat.com>
Tue, 21 Feb 2012 10:43:34 +0000 (10:43 +0000)
committerRichard W.M. Jones <rjones@redhat.com>
Tue, 21 Feb 2012 10:45:53 +0000 (10:45 +0000)
or any other libraries.

lib/Makefile.am
lib/pa_when.ml

index 898f204..5ab4128 100644 (file)
@@ -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
index d646822..3b8f36e 100644 (file)
@@ -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 ())