From 15ea8d7da6be553a1a21611df57466144c56f129 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Fix Makefiles to use new bitmatch META file. --- diskzip/.depend | 6 ++---- diskzip/Makefile.in | 11 ++++------- lib/.depend | 40 ++++++++++++++++------------------------ lib/Makefile.in | 11 ++++------- virt-df/Makefile.in | 9 +++------ 5 files changed, 29 insertions(+), 48 deletions(-) diff --git a/diskzip/.depend b/diskzip/.depend index e54de33..18618bf 100644 --- a/diskzip/.depend +++ b/diskzip/.depend @@ -1,4 +1,2 @@ -diskzip.cmo: ../lib/int63.cmi diskzip_gettext.cmo ../lib/diskimage.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi -diskzip.cmx: ../lib/int63.cmx diskzip_gettext.cmx ../lib/diskimage.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi +diskzip.cmo: ../lib/int63.cmi diskzip_gettext.cmo ../lib/diskimage.cmi +diskzip.cmx: ../lib/int63.cmx diskzip_gettext.cmx ../lib/diskimage.cmx diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in index a976ace..9421ffc 100644 --- a/diskzip/Makefile.in +++ b/diskzip/Makefile.in @@ -28,8 +28,7 @@ bindir = @bindir@ pkg_gettext = @pkg_gettext@ -#OCAMLCPACKAGES := -package unix,extlib,bitmatch -I ../lib -OCAMLCPACKAGES := -package unix,extlib -I +bitmatch -I ../lib +OCAMLCPACKAGES := -package unix,extlib,bitmatch.syntax,bitmatch -I ../lib ifneq ($(pkg_gettext),no) OCAMLCPACKAGES += -package gettext-stub @@ -38,16 +37,14 @@ endif OBJS := diskzip_gettext.cmo diskzip.cmo XOBJS := $(OBJS:.cmo=.cmx) -SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo" +SYNTAX := -syntax bitmatch.syntax OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX) -#OCAMLCLIBS := -linkpkg diskimage.cma -OCAMLCLIBS := -linkpkg bitmatch.cma diskimage.cma +OCAMLCLIBS := -linkpkg diskimage.cma OCAMLOPTPACKAGES := $(OCAMLCPACKAGES) OCAMLOPTFLAGS := @OCAMLOPTFLAGS@ $(SYNTAX) -#OCAMLOPTLIBS := -linkpkg diskimage.cmxa -OCAMLOPTLIBS := -linkpkg bitmatch.cmxa diskimage.cmxa +OCAMLOPTLIBS := -linkpkg diskimage.cmxa OCAMLDEPFLAGS := $(SYNTAX) diff --git a/lib/.depend b/lib/.depend index f0db824..e9107b6 100644 --- a/lib/.depend +++ b/lib/.depend @@ -1,49 +1,41 @@ -diskimage_impl.cmi: int63.cmi /usr/lib64/ocaml/bitmatch/bitmatch.cmi +diskimage_impl.cmi: int63.cmi diskimage_lvm2_metadata.cmi: int63.cmi diskimage_lvm2_parser.cmi: int63.cmi diskimage_lvm2_metadata.cmi -diskimage.cmi: int63.cmi /usr/lib64/ocaml/bitmatch/bitmatch.cmi -diskimage_ext2.cmo: int63.cmi diskimage_impl.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_ext2.cmi -diskimage_ext2.cmx: int63.cmx diskimage_impl.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_ext2.cmi -diskimage_fat.cmo: int63.cmi diskimage_impl.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_fat.cmi -diskimage_fat.cmx: int63.cmx diskimage_impl.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_fat.cmi +diskimage.cmi: int63.cmi +diskimage_ext2.cmo: int63.cmi diskimage_impl.cmi diskimage_ext2.cmi +diskimage_ext2.cmx: int63.cmx diskimage_impl.cmx diskimage_ext2.cmi +diskimage_fat.cmo: int63.cmi diskimage_impl.cmi diskimage_fat.cmi +diskimage_fat.cmx: int63.cmx diskimage_impl.cmx diskimage_fat.cmi diskimage_impl.cmo: int63.cmi diskimage_impl.cmi diskimage_impl.cmx: int63.cmx diskimage_impl.cmi diskimage_linux_swap.cmo: int63.cmi diskimage_impl.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_linux_swap.cmi + diskimage_linux_swap.cmi diskimage_linux_swap.cmx: int63.cmx diskimage_impl.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_linux_swap.cmi + diskimage_linux_swap.cmi diskimage_linux_swsuspend.cmo: int63.cmi diskimage_impl.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_linux_swsuspend.cmi + diskimage_linux_swsuspend.cmi diskimage_linux_swsuspend.cmx: int63.cmx diskimage_impl.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_linux_swsuspend.cmi + diskimage_linux_swsuspend.cmi diskimage_lvm2_metadata.cmo: int63.cmi diskimage_lvm2_metadata.cmi diskimage_lvm2_metadata.cmx: int63.cmx diskimage_lvm2_metadata.cmi diskimage_lvm2.cmo: int63.cmi diskimage_lvm2_metadata.cmi diskimage_impl.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_lvm2.cmi + diskimage_lvm2.cmi diskimage_lvm2.cmx: int63.cmx diskimage_lvm2_metadata.cmx diskimage_impl.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_lvm2.cmi + diskimage_lvm2.cmi diskimage_lvm2_parser.cmo: int63.cmi diskimage_lvm2_metadata.cmi \ diskimage_lvm2_parser.cmi diskimage_lvm2_parser.cmx: int63.cmx diskimage_lvm2_metadata.cmx \ diskimage_lvm2_parser.cmi -diskimage_mbr.cmo: int63.cmi diskimage_impl.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_mbr.cmi -diskimage_mbr.cmx: int63.cmx diskimage_impl.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_mbr.cmi +diskimage_mbr.cmo: int63.cmi diskimage_impl.cmi diskimage_mbr.cmi +diskimage_mbr.cmx: int63.cmx diskimage_impl.cmx diskimage_mbr.cmi diskimage.cmo: diskimage_ntfs.cmi diskimage_mbr.cmi diskimage_lvm2.cmi \ diskimage_linux_swsuspend.cmi diskimage_linux_swap.cmi diskimage_impl.cmi \ diskimage_fat.cmi diskimage_ext2.cmi diskimage.cmi diskimage.cmx: diskimage_ntfs.cmx diskimage_mbr.cmx diskimage_lvm2.cmx \ diskimage_linux_swsuspend.cmx diskimage_linux_swap.cmx diskimage_impl.cmx \ diskimage_fat.cmx diskimage_ext2.cmx diskimage.cmi -diskimage_ntfs.cmo: int63.cmi diskimage_impl.cmi \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_ntfs.cmi -diskimage_ntfs.cmx: int63.cmx diskimage_impl.cmx \ - /usr/lib64/ocaml/bitmatch/bitmatch.cmi diskimage_ntfs.cmi +diskimage_ntfs.cmo: int63.cmi diskimage_impl.cmi diskimage_ntfs.cmi +diskimage_ntfs.cmx: int63.cmx diskimage_impl.cmx diskimage_ntfs.cmi int63.cmo: int63.cmi int63.cmx: int63.cmi int63_on_32.cmo: int63_on_32.cmi diff --git a/lib/Makefile.in b/lib/Makefile.in index 2d90f8a..64c4781 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -28,8 +28,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -#OCAMLCPACKAGES := -package unix,extlib,bitmatch -OCAMLCPACKAGES := -package unix,extlib -I +bitmatch +OCAMLCPACKAGES := -package unix,extlib,bitmatch.syntax #---------------------------------------------------------------------- # Build up the list of object files. @@ -55,16 +54,14 @@ XOBJS := $(OBJS:.cmo=.cmx) #---------------------------------------------------------------------- -SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo" +SYNTAX := -syntax bitmatch.syntax OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX) -#OCAMLCLIBS := -linkpkg -OCAMLCLIBS := -linkpkg bitmatch.cma +OCAMLCLIBS := -linkpkg OCAMLOPTPACKAGES := $(OCAMLCPACKAGES) OCAMLOPTFLAGS := @OCAMLOPTFLAGS@ $(SYNTAX) -#OCAMLOPTLIBS := $(OCAMLCLIBS) -OCAMLOPTLIBS := -linkpkg bitmatch.cmxa +OCAMLOPTLIBS := $(OCAMLCLIBS) OCAMLDEPFLAGS := $(SYNTAX) diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in index e2c184e..bd5d55f 100644 --- a/virt-df/Makefile.in +++ b/virt-df/Makefile.in @@ -28,8 +28,7 @@ bindir = @bindir@ pkg_gettext = @pkg_gettext@ -#OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt,bitmatch -I ../lib -OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt -I +bitmatch -I ../lib +OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt,bitmatch.syntax,bitmatch -I ../lib ifneq ($(pkg_gettext),no) OCAMLCPACKAGES += -package gettext-stub @@ -59,13 +58,11 @@ XOBJS := $(OBJS:.cmo=.cmx) #---------------------------------------------------------------------- OCAMLCFLAGS := @OCAMLCFLAGS@ -#OCAMLCLIBS := -linkpkg diskimage.cma -OCAMLCLIBS := -linkpkg bitmatch.cma diskimage.cma +OCAMLCLIBS := -linkpkg diskimage.cma OCAMLOPTPACKAGES := $(OCAMLCPACKAGES) OCAMLOPTFLAGS := @OCAMLOPTFLAGS@ -#OCAMLOPTLIBS := -linkpkg diskimage.cmxa -OCAMLOPTLIBS := -linkpkg bitmatch.cmxa diskimage.cmxa +OCAMLOPTLIBS := -linkpkg diskimage.cmxa BYTE_TARGETS := virt-df OPT_TARGETS := virt-df.opt -- 1.8.3.1