X-Git-Url: http://git.annexia.org/?p=whenjobs.git;a=blobdiff_plain;f=tools%2FMakefile.am;h=e7e467687113437adf75727372c9a79a59fed854;hp=bbb5fa8757d90c33dae7699378ce5989ab0ebfce;hb=efddbf83a5287c5d668cc04a0c7328cf5ca3e648;hpb=3f72b2439be42f884a27497e57354b9d7ad7c6ae;ds=sidebyside

diff --git a/tools/Makefile.am b/tools/Makefile.am
index bbb5fa8..e7e4676 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -39,6 +39,8 @@ OBJECTS = \
 	whenproto_clnt.cmo \
 	whenjobs.cmo
 
+XOBJECTS = $(OBJECTS:.cmo=.cmx)
+
 libdir.ml: Makefile
 	rm -f $@ $@-t
 	echo 'let libdir = "$(libdir)/$(PACKAGE_NAME)"' > $@-t
@@ -50,9 +52,15 @@ whenproto_clnt.ml whenproto_clnt.mli: whenproto.x
 whenproto.x: ../lib/whenproto.x
 	ln -f $< $@
 
+if HAVE_OCAMLOPT
+whenjobs: ../lib/whenlib.cmxa $(XOBJECTS)
+	$(OCAMLFIND) opt $(OCAMLCFLAGS) -ccopt -L../lib \
+	  -linkpkg whenlib.cmxa $(XOBJECTS) -o $@
+else
 whenjobs: ../lib/whenlib.cma $(OBJECTS)
-	$(OCAMLFIND) ocamlc -custom $(OCAMLCFLAGS) -ccopt -L../lib \
+	$(OCAMLFIND) c -custom $(OCAMLCFLAGS) -ccopt -L../lib \
 	  -linkpkg whenlib.cma $(OBJECTS) -o $@
+endif
 
 # Rules for all OCaml files.
 %.cmi: %.mli ../lib/whenlib.cma