X-Git-Url: http://git.annexia.org/?p=whenjobs.git;a=blobdiff_plain;f=daemon%2FMakefile.am;h=ac76e2845a5bee9a1c1b5936a6163a745654520b;hp=55ac8a16a634fb4d7d1770af197bb0c037275f86;hb=27dfc74b71d3b3b14a476667481f92c58a6d5c1d;hpb=61cad7bbaf63389b520b695eefdd735bc11a8aa6

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 55ac8a1..ac76e28 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -15,9 +15,11 @@
 # 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) whenjobsd.pod
+
 sbin_SCRIPTS = whenjobsd
 
-OCAMLPACKAGES = -package unix,num,camlp4.lib,rpc -I ../lib
+OCAMLPACKAGES = -package unix,num,camlp4.lib,calendar,rpc -I ../lib
 
 OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
@@ -39,9 +41,11 @@ OBJECTS = \
 	daemon.cmo \
 	whenjobsd.cmo
 
+XOBJECTS = $(OBJECTS:.cmo=.cmx)
+
 # Daemon.
 noinst_LIBRARIES = libdaemon.a
-libdaemon_a_SOURCES = syslog_c.c
+libdaemon_a_SOURCES = exit.c syslog_c.c
 libdaemon_a_CFLAGS = -I$(shell $(OCAMLC) -where)
 
 whenproto_srv.ml whenproto_srv.mli: whenproto.x
@@ -50,11 +54,19 @@ whenproto_srv.ml whenproto_srv.mli: whenproto.x
 whenproto.x: ../lib/whenproto.x
 	ln -f $< $@
 
+if HAVE_OCAMLOPT
+whenjobsd: ../lib/whenlib.cmxa $(XOBJECTS) libdaemon.a
+	$(OCAMLFIND) opt $(OCAMLOPTFLAGS) -ccopt -L../lib \
+	  -linkpkg whenlib.cmxa \
+	  libdaemon_a-exit.o libdaemon_a-syslog_c.o \
+	  $(XOBJECTS) -o $@
+else
 whenjobsd: ../lib/whenlib.cma $(OBJECTS) libdaemon.a
 	$(OCAMLFIND) c -custom $(OCAMLCFLAGS) -ccopt -L../lib \
 	  -linkpkg whenlib.cma \
-	  libdaemon_a-syslog_c.o \
+	  libdaemon_a-exit.o libdaemon_a-syslog_c.o \
 	  $(OBJECTS) -o $@
+endif
 
 # Rules for all OCaml files.
 %.cmi: %.mli ../lib/whenlib.cma