git.annexia.org
/
whenjobs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: Don't include whenproto_aux.{ml,mli} in the tarball.
[whenjobs.git]
/
lib
/
Makefile.am
diff --git
a/lib/Makefile.am
b/lib/Makefile.am
index
cbd0a28
..
70d84fa
100644
(file)
--- a/
lib/Makefile.am
+++ b/
lib/Makefile.am
@@
-18,7
+18,11
@@
EXTRA_DIST = whenproto.x pa_when.ml $(SOURCES)
libwhenjobsdir = $(libdir)/$(PACKAGE_NAME)
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,calendar,rpc
OCAMLPACKAGES = -package unix,num,camlp4.lib,calendar,rpc
@@
-26,26
+30,51
@@
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
# These should be in alphabetical order.
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 \
config.mli \
SOURCES = \
config.ml \
config.mli \
+ whenexpr.ml \
+ whenexpr.mli \
whenfile.ml \
whenfile.mli \
whenlock.ml \
whenlock.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 \
# In dependency order.
OBJECTS = \
config.cmo \
whenproto_aux.cmo \
whenutils.cmo \
+ whenexpr.cmo \
+ whenstate.cmo \
whenfile.cmo \
whenfile.cmo \
+ whentools.cmo \
whenlock.cmo
whenlock.cmo
+XOBJECTS = $(OBJECTS:.cmo=.cmx)
+
# Library.
noinst_LIBRARIES = liblibrary.a
liblibrary_a_SOURCES = flock.c
# Library.
noinst_LIBRARIES = liblibrary.a
liblibrary_a_SOURCES = flock.c
@@
-54,6
+83,9
@@
liblibrary_a_CFLAGS = -I$(shell $(OCAMLC) -where)
whenlib.cma: $(OBJECTS) liblibrary.a
$(OCAMLFIND) c -a $(OCAMLCFLAGS) $(OBJECTS) -cclib -llibrary -o $@
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 $<
whenproto_aux.ml whenproto_aux.mli: whenproto.x
$(OCAMLRPCGEN) -int int32 -hyper int64 -aux $<