From: Richard W.M. Jones <"Richard W.M. Jones "> Date: Wed, 9 Jul 2008 11:36:47 +0000 (+0100) Subject: Use META file from newest bitmatch. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=1801e81b516eb2e3d019ab6d7141eb3be886b251;p=virt-mem.git Use META file from newest bitmatch. --- diff --git a/dmesg/Makefile.in b/dmesg/Makefile.in index bb23f07..10333a4 100644 --- a/dmesg/Makefile.in +++ b/dmesg/Makefile.in @@ -23,10 +23,9 @@ INSTALL = @INSTALL@ MKDIR_P = @MKDIR_P@ bindir = @bindir@ -SYNTAX = -pp "camlp4o -I$$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo" +SYNTAX = -syntax bitmatch.syntax -#OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch -OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light -I +bitmatch -I ../lib +OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch.syntax -I ../lib ifneq ($(pkg_gettext),no) OCAMLCPACKAGES += -package gettext-stub diff --git a/lib/.depend b/lib/.depend index 3e083d2..33e3139 100644 --- a/lib/.depend +++ b/lib/.depend @@ -1,12 +1,8 @@ virt_mem.cmi: virt_mem_utils.cmo virt_mem_mmap.cmi -virt_mem_mmap.cmi: virt_mem_utils.cmo /usr/lib64/ocaml/bitmatch/bitmatch.cmi +virt_mem_mmap.cmi: virt_mem_utils.cmo virt_mem.cmo: virt_mem_version.cmo virt_mem_utils.cmo virt_mem_mmap.cmi \ - virt_mem_gettext.cmo /usr/lib64/ocaml/bitmatch/bitmatch.cmi virt_mem.cmi + virt_mem_gettext.cmo virt_mem.cmi virt_mem.cmx: virt_mem_version.cmx virt_mem_utils.cmx virt_mem_mmap.cmx \ - virt_mem_gettext.cmx /usr/lib64/ocaml/bitmatch/bitmatch.cmi virt_mem.cmi -virt_mem_mmap.cmo: virt_mem_utils.cmo /usr/lib64/ocaml/bitmatch/bitmatch.cmi \ - virt_mem_mmap.cmi -virt_mem_mmap.cmx: virt_mem_utils.cmx /usr/lib64/ocaml/bitmatch/bitmatch.cmi \ - virt_mem_mmap.cmi -virt_mem_utils.cmo: /usr/lib64/ocaml/bitmatch/bitmatch.cmi -virt_mem_utils.cmx: /usr/lib64/ocaml/bitmatch/bitmatch.cmi + virt_mem_gettext.cmx virt_mem.cmi +virt_mem_mmap.cmo: virt_mem_utils.cmo virt_mem_mmap.cmi +virt_mem_mmap.cmx: virt_mem_utils.cmx virt_mem_mmap.cmi diff --git a/lib/Makefile.in b/lib/Makefile.in index c520552..f0c75f4 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -21,10 +21,9 @@ VERSION = @PACKAGE_VERSION@ INSTALL = @INSTALL@ -SYNTAX = -pp "camlp4o -I$$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo" +SYNTAX = -syntax bitmatch.syntax -#OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch -OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light -I +bitmatch +OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch.syntax ifneq ($(pkg_gettext),no) OCAMLCPACKAGES += -package gettext-stub diff --git a/po/Makefile.in b/po/Makefile.in index 210b986..8098c3d 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -23,7 +23,7 @@ LINGUAS = $(shell cat LINGUAS) SOURCES = POTFILES OCAML_GETTEXT = @OCAML_GETTEXT@ -OCAML_GETTEXT_EXTRACT_OPTIONS = --extract-default-option "-I +camlp4 pa_o.cmo -I $$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo" +OCAML_GETTEXT_EXTRACT_OPTIONS = --extract-default-option "-I +camlp4 pa_o.cmo -I $$(ocamlc -where)/bitmatch bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo" OCAML_GETTEXT_COMPILE_OPTIONS = OCAML_GETTEXT_INSTALL_OPTIONS = OCAML_GETTEXT_MERGE_OPTIONS = diff --git a/po/ja.po b/po/ja.po index 49394b0..bb88d92 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,3 +1,4 @@ +#, fuzzy msgid "" msgstr "" "Project-Id-Version: virt-p2v--devel\n" @@ -35,23 +36,23 @@ msgstr "" msgid "%s: unknown parameter" msgstr "" -#: ../lib/virt_mem.ml:207 ../lib/virt_mem.ml:265 +#: ../lib/virt_mem.ml:265 ../lib/virt_mem.ml:207 msgid "%s: use -A to define architecture (i386/x86-64 only) for this image" msgstr "" -#: ../lib/virt_mem.ml:198 ../lib/virt_mem.ml:256 +#: ../lib/virt_mem.ml:256 ../lib/virt_mem.ml:198 msgid "%s: use -E to define endianness for this image" msgstr "" -#: ../lib/virt_mem.ml:211 ../lib/virt_mem.ml:269 +#: ../lib/virt_mem.ml:269 ../lib/virt_mem.ml:211 msgid "%s: use -T to define kernel load address for this image" msgstr "" -#: ../lib/virt_mem.ml:191 ../lib/virt_mem.ml:249 +#: ../lib/virt_mem.ml:249 ../lib/virt_mem.ml:191 msgid "%s: use -W to define word size for this image" msgstr "" -#: ../lib/virt_mem.ml:124 ../lib/virt_mem.ml:126 +#: ../lib/virt_mem.ml:126 ../lib/virt_mem.ml:124 msgid "Connect to URI" msgstr "" diff --git a/po/pl.po b/po/pl.po index 5d9cb97..5ef7a2e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,3 +1,4 @@ +#, fuzzy msgid "" msgstr "" "Project-Id-Version: pl\n" @@ -34,23 +35,23 @@ msgstr "" msgid "%s: unknown parameter" msgstr "%s: nieznany parametr" -#: ../lib/virt_mem.ml:207 ../lib/virt_mem.ml:265 +#: ../lib/virt_mem.ml:265 ../lib/virt_mem.ml:207 msgid "%s: use -A to define architecture (i386/x86-64 only) for this image" msgstr "" -#: ../lib/virt_mem.ml:198 ../lib/virt_mem.ml:256 +#: ../lib/virt_mem.ml:256 ../lib/virt_mem.ml:198 msgid "%s: use -E to define endianness for this image" msgstr "" -#: ../lib/virt_mem.ml:211 ../lib/virt_mem.ml:269 +#: ../lib/virt_mem.ml:269 ../lib/virt_mem.ml:211 msgid "%s: use -T to define kernel load address for this image" msgstr "" -#: ../lib/virt_mem.ml:191 ../lib/virt_mem.ml:249 +#: ../lib/virt_mem.ml:249 ../lib/virt_mem.ml:191 msgid "%s: use -W to define word size for this image" msgstr "" -#: ../lib/virt_mem.ml:124 ../lib/virt_mem.ml:126 +#: ../lib/virt_mem.ml:126 ../lib/virt_mem.ml:124 msgid "Connect to URI" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 493cef3..efa4708 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,3 +1,4 @@ +#, fuzzy msgid "" msgstr "" "Project-Id-Version: pt_BR\n" @@ -38,23 +39,23 @@ msgstr "" msgid "%s: unknown parameter" msgstr "%s: parâmetro desconhecido" -#: ../lib/virt_mem.ml:207 ../lib/virt_mem.ml:265 +#: ../lib/virt_mem.ml:265 ../lib/virt_mem.ml:207 msgid "%s: use -A to define architecture (i386/x86-64 only) for this image" msgstr "" -#: ../lib/virt_mem.ml:198 ../lib/virt_mem.ml:256 +#: ../lib/virt_mem.ml:256 ../lib/virt_mem.ml:198 msgid "%s: use -E to define endianness for this image" msgstr "" -#: ../lib/virt_mem.ml:211 ../lib/virt_mem.ml:269 +#: ../lib/virt_mem.ml:269 ../lib/virt_mem.ml:211 msgid "%s: use -T to define kernel load address for this image" msgstr "" -#: ../lib/virt_mem.ml:191 ../lib/virt_mem.ml:249 +#: ../lib/virt_mem.ml:249 ../lib/virt_mem.ml:191 msgid "%s: use -W to define word size for this image" msgstr "" -#: ../lib/virt_mem.ml:124 ../lib/virt_mem.ml:126 +#: ../lib/virt_mem.ml:126 ../lib/virt_mem.ml:124 msgid "Connect to URI" msgstr "" diff --git a/po/virt-mem.pot b/po/virt-mem.pot index 67178a0..b8f2bd1 100644 --- a/po/virt-mem.pot +++ b/po/virt-mem.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-10 16:27+0000\n" +"POT-Creation-Date: 2008-07-09 11:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/ps/Makefile.in b/ps/Makefile.in index b9de26b..1186c69 100644 --- a/ps/Makefile.in +++ b/ps/Makefile.in @@ -23,10 +23,9 @@ INSTALL = @INSTALL@ MKDIR_P = @MKDIR_P@ bindir = @bindir@ -SYNTAX = -pp "camlp4o -I$$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo" +SYNTAX = -syntax bitmatch.syntax -#OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch -OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light -I +bitmatch -I ../lib +OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch.syntax -I ../lib ifneq ($(pkg_gettext),no) OCAMLCPACKAGES += -package gettext-stub diff --git a/uname/.depend b/uname/.depend index 0adc4a7..8738997 100644 --- a/uname/.depend +++ b/uname/.depend @@ -1,6 +1,4 @@ virt_uname.cmo: ../lib/virt_mem_utils.cmo ../lib/virt_mem_mmap.cmi \ - ../lib/virt_mem_gettext.cmo ../lib/virt_mem.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi + ../lib/virt_mem_gettext.cmo ../lib/virt_mem.cmi virt_uname.cmx: ../lib/virt_mem_utils.cmx ../lib/virt_mem_mmap.cmx \ - ../lib/virt_mem_gettext.cmx ../lib/virt_mem.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi + ../lib/virt_mem_gettext.cmx ../lib/virt_mem.cmx diff --git a/uname/Makefile.in b/uname/Makefile.in index 3c10dee..d44b043 100644 --- a/uname/Makefile.in +++ b/uname/Makefile.in @@ -23,10 +23,9 @@ INSTALL = @INSTALL@ MKDIR_P = @MKDIR_P@ bindir = @bindir@ -SYNTAX = -pp "camlp4o -I$$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo" +SYNTAX = -syntax bitmatch.syntax -#OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch -OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light -I +bitmatch -I ../lib +OCAMLCPACKAGES = -package unix,bigarray,extlib,libvirt,xml-light,bitmatch.syntax -I ../lib ifneq ($(pkg_gettext),no) OCAMLCPACKAGES += -package gettext-stub