# 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
pkg_gettext = @pkg_gettext@
-#OCAMLCPACKAGES := -package unix,extlib,bitmatch -I ../lib
-OCAMLCPACKAGES := -package unix,extlib -I +bitmatch -I ../lib
+OCAMLCPACKAGES := -package unix,extlib,bitstring.syntax,bitstring -I ../lib
ifneq ($(pkg_gettext),no)
OCAMLCPACKAGES += -package gettext-stub
OBJS := diskzip_gettext.cmo diskzip.cmo
XOBJS := $(OBJS:.cmo=.cmx)
-SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+SYNTAX := -syntax bitstring.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)
-OCAMLOPTFLAGS := -w s $(SYNTAX)
-#OCAMLOPTLIBS := -linkpkg diskimage.cmxa
-OCAMLOPTLIBS := -linkpkg bitmatch.cmxa diskimage.cmxa
+OCAMLOPTFLAGS := @OCAMLOPTFLAGS@ $(SYNTAX)
+OCAMLOPTLIBS := -linkpkg diskimage.cmxa
OCAMLDEPFLAGS := $(SYNTAX)
opt: $(OPT_TARGETS)
-diskzip: $(OBJS)
+diskzip: $(OBJS) ../lib/diskimage.cma
ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
- -o $@ $^
+ -o $@ $(OBJS)
-diskzip.opt: $(XOBJS)
+diskzip.opt: $(XOBJS) ../lib/diskimage.cmxa
ocamlfind ocamlopt \
$(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
- -o $@ $^
+ -o $@ $(XOBJS)
# Manual page.
ifeq ($(HAVE_PERLDOC),perldoc)