X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-df%2FMakefile.in;h=312a257ebb39f1ce97c55ecdecb230077e5ce069;hb=c41e41856282c000b7c8566d6f75eb4c6287367f;hp=16347fa6fb7e47b32d11db881f5aa96fc3786618;hpb=817ac8746e7e69df161e8ce45e1ee4a3282469d3;p=virt-df.git

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index 16347fa..312a257 100644
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -1,4 +1,5 @@
 # virt-df
+# @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
@@ -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