Reorder SOURCES for consistency.

[whenjobs.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 47285cd..99ace91 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,10 +15,12 @@
 # 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,rpc
+OCAMLPACKAGES = -package unix,num,camlp4.lib,calendar,rpc
 
 OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
@@ -26,20 +28,33 @@ 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
+       whenutils.ml \
+       whenutils.mli
+
+# In alphabetical order.
+CMI_FILES = \
+       config.cmi \
+       whenexpr.cmi
+       whenfile.cmi \
+       whenlock.cmi \
+       whenproto_aux.cmi \
+       whenutils.cmi
 
 # In dependency order.
 OBJECTS = \
        config.cmo \
        whenproto_aux.cmo \
        whenutils.cmo \
+       whenexpr.cmo \
        whenfile.cmo \
        whenlock.cmo
 
@@ -55,9 +70,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