X-Git-Url: http://git.annexia.org/?p=whenjobs.git;a=blobdiff_plain;f=lib%2FMakefile.am;h=70d84fa2063df914fde0a3df60bbf3dbac5d2893;hp=47285cd68a20725e0dfaf53f7a59b1b070546f22;hb=64ada3d57b1a6593b72d9a2d5e4a47bfc3729740;hpb=61cad7bbaf63389b520b695eefdd735bc11a8aa6;ds=sidebyside

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 47285cd..70d84fa 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,34 +15,66 @@
 # 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 = whenproto.x pa_when.ml $(SOURCES)
+
 libwhenjobsdir = $(libdir)/$(PACKAGE_NAME)
-libwhenjobs_SCRIPTS = whenlib.cma pa_when.cmo
+libwhenjobs_SCRIPTS = whenlib.cma pa_when.cmo $(CMI_FILES)
+
+if HAVE_OCAMLOPT
+libwhenjobs_SCRIPTS += whenlib.cmxa
+endif
 
-OCAMLPACKAGES = -package unix,num,camlp4.lib,rpc
+OCAMLPACKAGES = -package unix,num,camlp4.lib,calendar,rpc
 
 OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
 # These should be in alphabetical order. 
+#
+# NB. whenproto_aux.{ml,mli} are not included here.  These generated
+# files are not compatible across different versions of ocamlnet, so
+# must not be included in the tarball and should be regenerated by the
+# user each time.
 SOURCES = \
 	config.ml \
-	whenfile.mli \
+	config.mli \
+	whenexpr.ml \
+	whenexpr.mli \
 	whenfile.ml \
+	whenfile.mli \
 	whenlock.ml \
 	whenlock.mli \
-	whenproto_aux.ml \
-	whenproto_aux.mli \
-	whenutils.mli \
-	whenutils.ml
+	whenstate.ml \
+	whenstate.mli \
+	whentools.ml \
+	whentools.mli \
+	whenutils.ml \
+	whenutils.mli
+
+# In alphabetical order.
+CMI_FILES = \
+	config.cmi \
+	whenexpr.cmi \
+	whenfile.cmi \
+	whenlock.cmi \
+	whenproto_aux.cmi \
+	whenstate.cmi \
+	whentools.cmi \
+	whenutils.cmi
 
 # In dependency order.
 OBJECTS = \
 	config.cmo \
 	whenproto_aux.cmo \
 	whenutils.cmo \
+	whenexpr.cmo \
+	whenstate.cmo \
 	whenfile.cmo \
+	whentools.cmo \
 	whenlock.cmo
 
+XOBJECTS = $(OBJECTS:.cmo=.cmx)
+
 # Library.
 noinst_LIBRARIES = liblibrary.a
 liblibrary_a_SOURCES = flock.c
@@ -51,13 +83,19 @@ liblibrary_a_CFLAGS = -I$(shell $(OCAMLC) -where)
 whenlib.cma: $(OBJECTS) liblibrary.a
 	$(OCAMLFIND) c -a $(OCAMLCFLAGS) $(OBJECTS) -cclib -llibrary -o $@
 
+whenlib.cmxa: $(XOBJECTS) liblibrary.a
+	$(OCAMLFIND) opt -a $(OCAMLOPTFLAGS) $(XOBJECTS) -cclib -llibrary -o $@
+
 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