arm: Fix for test running slowly.

[whenjobs.git] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1941e22..e7e4676 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,11 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+EXTRA_DIST = $(SOURCES) whenjobs.pod
+
 bin_SCRIPTS = whenjobs
 
-OCAMLPACKAGES = -package unix,num,camlp4.lib,rpc
+OCAMLPACKAGES = -package unix,num,camlp4.lib,calendar,rpc -I ../lib
 
-OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) -I ../lib
+OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
 # These should be in alphabetical order. 
@@ -37,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
@@ -48,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
@@ -86,6 +96,11 @@ whenjobs.1: whenjobs.pod
          --stderr --utf8 \
          $< > $@
 
+whenjobs.txt: whenjobs.pod
+       pod2text \
+         --stderr --utf8 \
+         $< > $@
+
 CLEANFILES = \
        *.cmi *.cmo *.cmx *.cma *.cmxa *~ \
        libdir.ml \