X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-df%2FMakefile.in;h=4a56d2d381b509f5d6413c0d13ef38137725b4e8;hb=fabdbe4e169e123774ab1bf665cdf4a4e9536296;hp=cc25c9c34753a0fb02cb58260473d9b3152ec6fa;hpb=3126bfee333b5c635dc60a54265936af06117f6a;p=virt-top.git

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
old mode 100755
new mode 100644
index cc25c9c..4a56d2d
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -25,24 +25,39 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
-pkg_xml_light	= @pkg_xml_light@
+pkg_gettext     = @pkg_gettext@
 
-OCAMLCPACKAGES	:= -package unix,extlib,xml-light
+#OCAMLCPACKAGES	:= -package unix,extlib,xml-light,bitmatch
+OCAMLCPACKAGES	:= -package unix,extlib,xml-light -I +bitmatch
+
+ifneq ($(pkg_gettext),no)
+OCAMLCPACKAGES  += -package gettext-stub
+endif
+
+OBJS		:= \
+	virt_df_gettext.cmo \
+	virt_df.cmo \
+	virt_df_ext2.cmo \
+	virt_df_linux_swap.cmo \
+	virt_df_lvm2.cmo \
+	virt_df_mbr.cmo \
+	virt_df_main.cmo
 
-OBJS		:= virt_df.cmo \
-		   virt_df_ext2.cmo \
-		   virt_df_linux_swap.cmo \
-		   virt_df_lvm2.cmo \
-		   virt_df_main.cmo
 XOBJS		:= $(OBJS:.cmo=.cmx)
 
+SYNTAX		:= -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+
 OCAMLCPACKAGES  += -I ../libvirt
-OCAMLCFLAGS	:= -g -w s
-OCAMLCLIBS	:= -linkpkg
+OCAMLCFLAGS	:= -g -w s $(SYNTAX)
+#OCAMLCLIBS	:= -linkpkg
+OCAMLCLIBS	:= -linkpkg bitmatch.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS	:= -w s
-OCAMLOPTLIBS	:= $(OCAMLCLIBS)
+OCAMLOPTFLAGS	:= -w s $(SYNTAX)
+#OCAMLOPTLIBS	:= $(OCAMLCLIBS)
+OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa
+
+OCAMLDEPFLAGS	:= $(SYNTAX)
 
 export LIBRARY_PATH=../libvirt
 export LD_LIBRARY_PATH=../libvirt
@@ -50,9 +65,9 @@ export LD_LIBRARY_PATH=../libvirt
 BYTE_TARGETS	:= virt-df
 OPT_TARGETS	:= virt-df.opt
 
-#ifeq ($(HAVE_PERLDOC),perldoc)
-#BYTE_TARGETS	+= virt-df.1 virt-df.txt
-#endif
+ifeq ($(HAVE_PERLDOC),perldoc)
+BYTE_TARGETS	+= virt-df.1 virt-df.txt
+endif
 
 all: $(BYTE_TARGETS)
 
@@ -65,17 +80,17 @@ virt-df: $(OBJS)
 virt-df.opt: $(XOBJS)
 	ocamlfind ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa -cclib -lncurses -o $@ $^
+	  ../libvirt/mllibvirt.cmxa -o $@ $^
 
 # Manual page.
-#ifeq ($(HAVE_PERLDOC),perldoc)
-#virt-df.1: virt-df.pod
-#	pod2man -c "Virtualization Support" --release "$(PACKAGE)-$(VERSION)" \
-#		$< > $@
-#
-#virt-df.txt: virt-df.pod
-#	pod2text $< > $@
-#endif
+ifeq ($(HAVE_PERLDOC),perldoc)
+virt-df.1: virt-df.pod
+	pod2man -c "Virtualization Support" --release "$(PACKAGE)-$(VERSION)" \
+		$< > $@
+
+virt-df.txt: virt-df.pod
+	pod2text $< > $@
+endif
 
 install:
 	if [ -x virt-df.opt ]; then \