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
Renaming bitmatch -> bitstring.
[ocaml-bitstring.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
a1a1eb6
..
c60a315
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-1,4
+1,4
@@
-# Bit
match
syntax extension.
+# Bit
string
syntax extension.
# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones
#
# This library is free software; you can redistribute it and/or
# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones
#
# This library is free software; you can redistribute it and/or
@@
-25,6
+25,9
@@
OCAMLMKLIB = @OCAMLMKLIB@
OCAMLDOC = @OCAMLDOC@
INSTALL = @INSTALL@
OCAMLDOC = @OCAMLDOC@
INSTALL = @INSTALL@
+pkg_cil = @pkg_cil@
+pkg_extlib = @pkg_extlib@
+
OCAMLCFLAGS = -g
OCAMLCPACKAGES =
OCAMLOPTFLAGS =
OCAMLCFLAGS = -g
OCAMLCPACKAGES =
OCAMLOPTFLAGS =
@@
-34,61
+37,65
@@
OCAMLDOCFLAGS = -html -sort
SUBDIRS =
ifneq ($(pkg_cil),no)
SUBDIRS =
ifneq ($(pkg_cil),no)
+ifneq ($(pkg_extlib),no)
SUBDIRS += cil-tools
endif
SUBDIRS += cil-tools
endif
+endif
EXAMPLES = $(patsubst %.ml,%,$(wildcard examples/*.ml))
TESTS = $(patsubst %.ml,%,$(wildcard tests/*.ml))
EXAMPLES = $(patsubst %.ml,%,$(wildcard examples/*.ml))
TESTS = $(patsubst %.ml,%,$(wildcard tests/*.ml))
-all: bit
match.cma bitmatch
_persistent.cma \
- bit
match.cmxa bitmatch
_persistent.cmxa \
- pa_bit
match
.cmo \
- bit
match
-objinfo
+all: bit
string.cma bitstring
_persistent.cma \
+ bit
string.cmxa bitstring
_persistent.cmxa \
+ pa_bit
string
.cmo \
+ bit
string
-objinfo
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
-bitmatch.cma: bitmatch_types.cmo bitmatch_config.cmo bitmatch.cmo
+bitstring.cma: bitstring_types.cmo bitstring_config.cmo bitstring.cmo \
+ bitmatch.cmo
$(OCAMLFIND) ocamlc -a -o $@ $^
$(OCAMLFIND) ocamlc -a -o $@ $^
-bit
match_persistent.cma: bitmatch
_persistent.cmo
+bit
string_persistent.cma: bitstring
_persistent.cmo
$(OCAMLFIND) ocamlc -a -o $@ $^
$(OCAMLFIND) ocamlc -a -o $@ $^
-bit
match_persistent.cmo: bitmatch
_persistent.ml
+bit
string_persistent.cmo: bitstring
_persistent.ml
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
-bitmatch.cmxa: bitmatch_types.cmx bitmatch_config.cmx bitmatch.cmx
+bitstring.cmxa: bitstring_types.cmx bitstring_config.cmx bitstring.cmx \
+ bitmatch.cmx
$(OCAMLFIND) ocamlopt -a -o $@ $^
$(OCAMLFIND) ocamlopt -a -o $@ $^
-bit
match_persistent.cmxa: bitmatch
_persistent.cmx
+bit
string_persistent.cmxa: bitstring
_persistent.cmx
$(OCAMLFIND) ocamlopt -a -o $@ $^
$(OCAMLFIND) ocamlopt -a -o $@ $^
-bit
match_persistent.cmx: bitmatch
_persistent.ml
+bit
string_persistent.cmx: bitstring
_persistent.ml
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
-bit
match_persistent.cmi: bitmatch
_persistent.mli
+bit
string_persistent.cmi: bitstring
_persistent.mli
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
-I +camlp4 -pp camlp4of -c $<
-pa_bit
match.cmo: pa_bitmatch.ml bitmatch.cma bitmatch
_persistent.cma
- $(OCAMLFIND) ocamlc bit
match
.cma -I +camlp4 camlp4lib.cma \
+pa_bit
string.cmo: pa_bitstring.ml bitstring.cma bitstring
_persistent.cma
+ $(OCAMLFIND) ocamlc bit
string
.cma -I +camlp4 camlp4lib.cma \
-pp camlp4of -c $< -o $@
-pp camlp4of -c $< -o $@
-bit
match-objinfo: bitmatch_objinfo.cmo bitmatch.cma bitmatch
_persistent.cma
+bit
string-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring
_persistent.cma
$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
- bit
match.cma bitmatch
_persistent.cma \
+ bit
string.cma bitstring
_persistent.cma \
$< -o $@
# Tests and examples.
$< -o $@
# Tests and examples.
-PP = -pp "camlp4o bit
match.cma bitmatch_persistent.cma pa_bitmatch
.cmo"
+PP = -pp "camlp4o bit
string.cma bitstring_persistent.cma pa_bitstring
.cmo"
-test: pa_bit
match.cmo bitmatch.cma bitmatch
_persistent.cma tests/test.bmpp
+test: pa_bit
string.cmo bitstring.cma bitstring
_persistent.cma tests/test.bmpp
@for f in $(TESTS); do \
echo Building $$f; \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
@for f in $(TESTS); do \
echo Building $$f; \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
- -package unix -linkpkg -I . bit
match
.cma $$f.ml -o $$f; \
+ -package unix -linkpkg -I . bit
string
.cma $$f.ml -o $$f; \
if [ $$? -ne 0 ]; then exit 1; fi; \
echo Running $$f; \
$$f; \
if [ $$? -ne 0 ]; then exit 1; fi; \
echo Running $$f; \
$$f; \
@@
-103,35
+110,35
@@
tests/test.bmpp: create_test_pattern
create_test_pattern: create_test_pattern.cmo
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
unix.cma -I +camlp4 camlp4lib.cma \
create_test_pattern: create_test_pattern.cmo
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
unix.cma -I +camlp4 camlp4lib.cma \
- -I . bit
match.cma bitmatch
_persistent.cma $< -o $@
+ -I . bit
string.cma bitstring
_persistent.cma $< -o $@
create_test_pattern.cmo: create_test_pattern.ml
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
unix.cma -I +camlp4 \
-I . -c $< -o $@
create_test_pattern.cmo: create_test_pattern.ml
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
unix.cma -I +camlp4 \
-I . -c $< -o $@
-examples: pa_bit
match.cmo bitmatch.cma bitmatch
_persistent.cma
+examples: pa_bit
string.cmo bitstring.cma bitstring
_persistent.cma
@for f in $(EXAMPLES); do \
echo Building $$f; \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
@for f in $(EXAMPLES); do \
echo Building $$f; \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
- -package unix -linkpkg -I . bit
match
.cma $$f.ml -o $$f; \
+ -package unix -linkpkg -I . bit
string
.cma $$f.ml -o $$f; \
if [ $$? -ne 0 ]; then exit 1; fi; \
done
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
if [ $$? -ne 0 ]; then exit 1; fi; \
done
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
-print-tests: pa_bit
match.cmo bitmatch
_persistent.cma
+print-tests: pa_bit
string.cmo bitstring
_persistent.cma
@for f in $(TESTS); do \
echo Test: $$f.ml; \
@for f in $(TESTS); do \
echo Test: $$f.ml; \
- cmd="camlp4o bit
match.cma bitmatch_persistent.cma pa_bitmatch
.cmo \
+ cmd="camlp4o bit
string.cma bitstring_persistent.cma pa_bitstring
.cmo \
-printer pr_o.cmo $$f.ml"; \
echo $$cmd; \
$$cmd; \
done
-printer pr_o.cmo $$f.ml"; \
echo $$cmd; \
$$cmd; \
done
-print-examples: pa_bit
match
.cmo
+print-examples: pa_bit
string
.cmo
@for f in $(EXAMPLES); do \
echo Example: $$f.ml; \
@for f in $(EXAMPLES); do \
echo Example: $$f.ml; \
- camlp4o bit
match.cma bitmatch_persistent.cma pa_bitmatch
.cmo \
+ camlp4o bit
string.cma bitstring_persistent.cma pa_bitstring
.cmo \
-printer pr_o.cmo $$f.ml; \
if [ $$? -ne 0 ]; then exit 1; fi; \
done
-printer pr_o.cmo $$f.ml; \
if [ $$? -ne 0 ]; then exit 1; fi; \
done
@@
-147,7
+154,8
@@
clean:
distclean: clean
rm -rf autom4te.cache
rm -f config.log config.status
distclean: clean
rm -rf autom4te.cache
rm -f config.log config.status
- rm -f config.h Makefile META bitmatch_config.ml
+ rm -f config.h Makefile META bitstring_config.ml
+ rm -f bitstring-objinfo
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
# Documentation.
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
# Documentation.
@@
-157,16
+165,16
@@
doc:
rm -rf html
mkdir html
$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html -I +camlp4 \
rm -rf html
mkdir html
$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html -I +camlp4 \
- bit
match.mli bitmatch
_persistent.mli
+ bit
string.mli bitstring
_persistent.mli
endif
# Install.
install:
endif
# Install.
install:
- ocamlfind install bit
match
META *.mli *.cmx *.cma *.cmxa *.a \
- bit
match
.cmi \
- bit
match
_persistent.cmi \
- pa_bit
match
.cmo
+ ocamlfind install bit
string
META *.mli *.cmx *.cma *.cmxa *.a \
+ bit
string
.cmi \
+ bit
string
_persistent.cmi \
+ pa_bit
string
.cmo
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
# Standard rules.
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
# Standard rules.
@@
-181,16
+189,16
@@
install:
depend: .depend
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
depend: .depend
@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
-.depend: bit
match.ml bitmatch
.mli \
- bit
match_persistent.ml bitmatch
_persistent.mli \
- bit
match
_objinfo.ml \
+.depend: bit
string.ml bitstring
.mli \
+ bit
string_persistent.ml bitstring
_persistent.mli \
+ bit
string
_objinfo.ml \
create_test_pattern.ml
rm -f .depend
$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) \
create_test_pattern.ml
rm -f .depend
$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) \
- bit
match.ml bitmatch
.mli \
- bit
match
_objinfo.ml >> $@
+ bit
string.ml bitstring
.mli \
+ bit
string
_objinfo.ml >> $@
$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) -pp camlp4of \
$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) -pp camlp4of \
- bit
match_persistent.ml bitmatch
_persistent.mli \
+ bit
string_persistent.ml bitstring
_persistent.mli \
create_test_pattern.ml >> $@
ifeq ($(wildcard .depend),.depend)
create_test_pattern.ml >> $@
ifeq ($(wildcard .depend),.depend)