git.annexia.org
/
ocaml-bitstring.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This patch completes the optimization / fastpaths in C enhancement.
[ocaml-bitstring.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
808146d
..
695d427
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-27,6
+27,11
@@
INSTALL = @INSTALL@
TIME = @TIME@
GPROF = @GPROF@
TIME = @TIME@
GPROF = @GPROF@
+BYTESWAP_H = @BYTESWAP_H@
+
+OCAMLLIB = @OCAMLLIB@
+top_srcdir = @top_srcdir@
+
pkg_cil = @pkg_cil@
pkg_extlib = @pkg_extlib@
pkg_cil = @pkg_cil@
pkg_extlib = @pkg_extlib@
@@
-37,6
+42,14
@@
OCAMLOPTPACKAGES =
OCAMLDOCFLAGS = -html -sort
OCAMLDOCFLAGS = -html -sort
+CC = @CC@
+CFLAGS = @CFLAGS@ -Wall -Werror -fPIC -I$(top_srcdir) -I$(OCAMLLIB)
+
+LIBRARY_PATH = @abs_top_builddir@
+LD_LIBRARY_PATH = @abs_top_builddir@
+export LIBRARY_PATH
+export LD_LIBRARY_PATH
+
SUBDIRS =
ifneq ($(pkg_cil),no)
ifneq ($(pkg_extlib),no)
SUBDIRS =
ifneq ($(pkg_cil),no)
ifneq ($(pkg_extlib),no)
@@
-50,15
+63,16
@@
TESTS = $(patsubst %.ml,%,$(wildcard tests/*.ml))
BENCHMARKS = $(patsubst %.ml,%,$(wildcard benchmarks/*.ml))
BENCHMARKS = $(patsubst %.ml,%,$(wildcard benchmarks/*.ml))
-all: bitstring.cma bitstring_persistent.cma \
+all: $(BYTESWAP_H) \
+ bitstring.cma bitstring_persistent.cma \
bitstring.cmxa bitstring_persistent.cmxa \
pa_bitstring.cmo \
bitstring-objinfo
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
bitstring.cmxa bitstring_persistent.cmxa \
pa_bitstring.cmo \
bitstring-objinfo
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
-bitstring.cma: bitstring_types.cmo bitstring_config.cmo
bitstring.cmo
\
- bitmatch.cmo
- $(OCAML
FIND) ocamlc -a -o $@
$^
+bitstring.cma: bitstring_types.cmo bitstring_config.cmo \
+ bit
string_c.o bitstring.cmo bit
match.cmo
+ $(OCAML
MKLIB) -o bitstring
$^
bitstring_persistent.cma: bitstring_persistent.cmo
$(OCAMLFIND) ocamlc -a -o $@ $^
bitstring_persistent.cma: bitstring_persistent.cmo
$(OCAMLFIND) ocamlc -a -o $@ $^
@@
-67,9
+81,9
@@
bitstring_persistent.cmo: bitstring_persistent.ml
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
-bitstring.cmxa: bitstring_types.cmx bitstring_config.cmx
bitstring.cmx
\
- bitmatch.cmx
- $(OCAML
FIND) ocamlopt -a -o $@
$^
+bitstring.cmxa: bitstring_types.cmx bitstring_config.cmx \
+ bit
string_c.o bitstring.cmx bit
match.cmx
+ $(OCAML
MKLIB) -o bitstring
$^
bitstring_persistent.cmxa: bitstring_persistent.cmx
$(OCAMLFIND) ocamlopt -a -o $@ $^
bitstring_persistent.cmxa: bitstring_persistent.cmx
$(OCAMLFIND) ocamlopt -a -o $@ $^
@@
-91,6
+105,15
@@
bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
bitstring.cma bitstring_persistent.cma \
$< -o $@
bitstring.cma bitstring_persistent.cma \
$< -o $@
+# Create byteswap.h if the system doesn't have this file.
+# From gnulib, license is LGPLv2+.
+
+byteswap.h: byteswap.in.h
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+ cat $(srcdir)/byteswap.in.h; \
+ } > $@-t
+ mv -f $@-t $@
+
# Tests and examples.
PP = -pp "camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
# Tests and examples.
PP = -pp "camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
@@
-207,7
+230,7
@@
endif
# Install.
install:
# Install.
install:
- ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a \
+ ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a
*.so
\
bitstring.cmi \
bitstring_persistent.cmi \
pa_bitstring.cmo
bitstring.cmi \
bitstring_persistent.cmi \
pa_bitstring.cmo