Fix parsing error with ~ versus -

[virt-df.git] / virt-df / Makefile.in

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index a2da6ce..312a257 100644 (file)
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -1,5 +1,6 @@
 # virt-df
-# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
+# @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
 # it under the terms of the GNU General Public License as published by
@@ -27,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,bitstring.syntax,bitstring -I ../lib
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
@@ -38,7 +38,7 @@ endif
 # Build up the list of object files.
 
 # Library objects.
-OBJS           := virt_df_gettext.cmo virt_df.cmo
+OBJS           := virt_df_gettext.cmo virt_df_version.cmo virt_df.cmo
 
 # Plug-in objects.
 ifneq ($(pkg_csv),no)
@@ -53,14 +53,12 @@ XOBJS               := $(OBJS:.cmo=.cmx)
 
 #----------------------------------------------------------------------
 
-OCAMLCFLAGS    := -g -w s
-#OCAMLCLIBS    := -linkpkg diskimage.cma
-OCAMLCLIBS     := -linkpkg bitmatch.cma diskimage.cma
+OCAMLCFLAGS    := @OCAMLCFLAGS@
+OCAMLCLIBS     := -linkpkg diskimage.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS  := -w s
-#OCAMLOPTLIBS  := -linkpkg diskimage.cmxa
-OCAMLOPTLIBS   := -linkpkg bitmatch.cmxa diskimage.cmxa
+OCAMLOPTFLAGS  := @OCAMLOPTFLAGS@
+OCAMLOPTLIBS   := -linkpkg diskimage.cmxa
 
 BYTE_TARGETS   := virt-df
 OPT_TARGETS    := virt-df.opt
@@ -73,14 +71,14 @@ all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
-virt-df: $(OBJS)
+virt-df: $(OBJS) ../lib/diskimage.cma
        ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-         -o $@ $^
+         -o $@ $(OBJS)
 
-virt-df.opt: $(XOBJS)
+virt-df.opt: $(XOBJS) ../lib/diskimage.cmxa
        ocamlfind ocamlopt \
          $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-         -o $@ $^
+         -o $@ $(XOBJS)
 
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)