git.annexia.org
/
virt-df.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Makefiles to use new bitmatch META file.
[virt-df.git]
/
diskzip
/
Makefile.in
diff --git
a/diskzip/Makefile.in
b/diskzip/Makefile.in
index
27f5ede
..
9421ffc
100644
(file)
--- a/
diskzip/Makefile.in
+++ b/
diskzip/Makefile.in
@@
-1,4
+1,5
@@
# diskzip
# diskzip
+# @configure_input@
# Copyright (C) 2007-2008 Red Hat Inc., Richard W.M. Jones
#
# This program is free software; you can redistribute it and/or modify
# Copyright (C) 2007-2008 Red Hat Inc., Richard W.M. Jones
#
# This program is free software; you can redistribute it and/or modify
@@
-27,8
+28,7
@@
bindir = @bindir@
pkg_gettext = @pkg_gettext@
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
ifneq ($(pkg_gettext),no)
OCAMLCPACKAGES += -package gettext-stub
@@
-37,19
+37,20
@@
endif
OBJS := diskzip_gettext.cmo diskzip.cmo
XOBJS := $(OBJS:.cmo=.cmx)
OBJS := diskzip_gettext.cmo diskzip.cmo
XOBJS := $(OBJS:.cmo=.cmx)
-SYNTAX := -
pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+SYNTAX := -
syntax bitmatch.syntax
-OCAMLCFLAGS := -g -w s $(SYNTAX)
-#OCAMLCLIBS := -linkpkg diskimage.cma
-OCAMLCLIBS := -linkpkg bitmatch.cma diskimage.cma
+OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX)
+OCAMLCLIBS := -linkpkg diskimage.cma
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS := -w s $(SYNTAX)
-#OCAMLOPTLIBS := -linkpkg diskimage.cmxa
-OCAMLOPTLIBS := -linkpkg bitmatch.cmxa diskimage.cmxa
+OCAMLOPTFLAGS := @OCAMLOPTFLAGS@ $(SYNTAX)
+OCAMLOPTLIBS := -linkpkg diskimage.cmxa
OCAMLDEPFLAGS := $(SYNTAX)
OCAMLDEPFLAGS := $(SYNTAX)
+OCAMLDOCFLAGS := $(SYNTAX) -I +extlib -I +bitmatch -I ../lib
+OCAMLDOCFILES := diskzip.ml
+
BYTE_TARGETS := diskzip
OPT_TARGETS := diskzip.opt
BYTE_TARGETS := diskzip
OPT_TARGETS := diskzip.opt
@@
-61,14
+62,14
@@
all: $(BYTE_TARGETS)
opt: $(OPT_TARGETS)
opt: $(OPT_TARGETS)
-diskzip: $(OBJS)
+diskzip: $(OBJS)
../lib/diskimage.cma
ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
- -o $@ $
^
+ -o $@ $
(OBJS)
-diskzip.opt: $(XOBJS)
+diskzip.opt: $(XOBJS)
../lib/diskimage.cmxa
ocamlfind ocamlopt \
$(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
ocamlfind ocamlopt \
$(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
- -o $@ $
^
+ -o $@ $
(XOBJS)
# Manual page.
ifeq ($(HAVE_PERLDOC),perldoc)
# Manual page.
ifeq ($(HAVE_PERLDOC),perldoc)