X-Git-Url: http://git.annexia.org/?p=whenjobs.git;a=blobdiff_plain;f=lib%2FMakefile.am;h=2a42d1eb422ddd134d75258ba95004a636d45c2a;hp=898f204f4b2e04b246409c1d246e9a18712b8156;hb=6cbf7b63ffeece43c2a8edda95a322622cf35e78;hpb=0f58f891d531defd1fa923dd2da93678c9c6f35b;ds=sidebyside

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 898f204..2a42d1e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,8 +15,10 @@
 # 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)
 
 OCAMLPACKAGES = -package unix,num,camlp4.lib,calendar,rpc
 
@@ -26,21 +28,42 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 # These should be in alphabetical order. 
 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
 
 # Library.
@@ -55,9 +78,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