X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-ctrl%2FMakefile.in;h=5ef63625bda7225630e73dcc5099177aaafa84bd;hp=c6966a8a16c857a95b1fa3e4d383cc4535618a43;hb=8a2211eb0976db33a6795ee9933bd7e7400c933c;hpb=d445e4f54fcfd19a98451eb0b5b5b5237bf9df78

diff --git a/virt-ctrl/Makefile.in b/virt-ctrl/Makefile.in
index c6966a8..5ef6362 100644
--- a/virt-ctrl/Makefile.in
+++ b/virt-ctrl/Makefile.in
@@ -21,17 +21,29 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
+pkg_dbus        = @pkg_dbus@
+
 OCAMLFIND	= @OCAMLFIND@
 
+OBJS := \
+	vc_helpers.cmo \
+	vc_connections.cmo \
+	vc_domain_ops.cmo \
+	vc_mainwindow.cmo
+
 ifneq ($(OCAMLFIND),)
-OCAMLCPACKAGES	:= -package unix,lablgtk2 -I ../libvirt
+OCAMLCPACKAGES	:= -I ../libvirt -package unix,lablgtk2
+ifeq ($(pkg_dbus),yes)
+OCAMLCPACKAGES  := $(OCAMLCPACKAGES),dbus
+OBJS            += vc_dbus.cmo
+endif
 OCAMLCFLAGS	:= -g
 OCAMLCLIBS	:= -linkpkg
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS	:=
 OCAMLOPTLIBS	:= $(OCAMLCLIBS)
 else
-OCAMLCINCS	:= -I @pkg_lablgtk2@ -I ../libvirt
+OCAMLCINCS	:= -I ../libvirt -I @pkg_lablgtk2@
 OCAMLCFLAGS	:= -g
 OCAMLCLIBS	:= unix.cma lablgtk.cma
 OCAMLOPTINCS	:= $(OCAMLCINCS)
@@ -45,12 +57,7 @@ export LD_LIBRARY_PATH=../libvirt
 BYTE_TARGETS	:= virt-ctrl
 OPT_TARGETS	:= virt-ctrl.opt
 
-OBJS := \
-	vc_helpers.cmo \
-	vc_connections.cmo \
-	vc_domain_ops.cmo \
-	vc_mainwindow.cmo \
-	virt_ctrl.cmo
+OBJS += virt_ctrl.cmo
 
 XOBJS := $(OBJS:.cmo=.cmx)
 
@@ -72,10 +79,25 @@ virt-ctrl: $(OBJS)
 	$(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
 	  ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
 
+host_os		= @host_os@
+
+ifneq ($(host_os),mingw32)
 virt-ctrl.opt: $(XOBJS)
-	$(OCAMLOPT) -verbose $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  -cclib "$(LDFLAGS)" \
+	$(OCAMLOPT) $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+	  $(patsubst %,-cclib %,$(LDFLAGS)) \
 	  ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
+else
+# On MinGW, use a hacked 'gcc' wrapper which understands the @...
+# syntax for extending the command line.
+gcc.exe: mingw-gcc-wrapper.ml
+	$(OCAMLC) unix.cma $< -o $@
+
+virt-ctrl.opt: $(XOBJS) gcc.exe
+	PATH=.:$$PATH \
+	$(OCAMLOPT) $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+	  $(patsubst %,-cclib %,$(LDFLAGS)) \
+	  ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $(XOBJS)
+endif
 endif
 
 install: