Some fixes to build process.

diff --git a/Makefile.in b/Makefile.in
index 199daf5..cb105fe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,10 +22,7 @@ INSTALL              = @INSTALL@
 
 MAKENSIS       = @MAKENSIS@
 
-OCAMLDOC        = @OCAMLDOC@
-OCAMLDOCFLAGS  := -html -sort
-
-SUBDIRS                = @subdirs@
+SUBDIRS                = virt-ctrl
 
 all opt depend install:
        for d in $(SUBDIRS); do \

diff --git a/virt-ctrl/.depend b/virt-ctrl/.depend
index 84ba14c..28ac5c2 100644 (file)
--- a/virt-ctrl/.depend
+++ b/virt-ctrl/.depend
@@ -1,28 +1,22 @@
-vc_connections.cmi: ../libvirt/libvirt.cmi 
 vc_domain_ops.cmi: vc_connections.cmi 
-vc_helpers.cmi: ../libvirt/libvirt.cmi 
 vc_mainwindow.cmi: vc_domain_ops.cmi 
 vc_connection_dlg.cmo: virt_ctrl_gettext.cmo vc_connections.cmi \
     vc_connection_dlg.cmi 
 vc_connection_dlg.cmx: virt_ctrl_gettext.cmx vc_connections.cmx \
     vc_connection_dlg.cmi 
-vc_connections.cmo: virt_ctrl_gettext.cmo vc_helpers.cmi \
-    ../libvirt/libvirt.cmi vc_connections.cmi 
-vc_connections.cmx: virt_ctrl_gettext.cmx vc_helpers.cmx \
-    ../libvirt/libvirt.cmx vc_connections.cmi 
+vc_connections.cmo: virt_ctrl_gettext.cmo vc_helpers.cmi vc_connections.cmi 
+vc_connections.cmx: virt_ctrl_gettext.cmx vc_helpers.cmx vc_connections.cmi 
 vc_dbus.cmo: virt_ctrl_gettext.cmo vc_connection_dlg.cmi vc_dbus.cmi 
 vc_dbus.cmx: virt_ctrl_gettext.cmx vc_connection_dlg.cmx vc_dbus.cmi 
-vc_domain_ops.cmo: virt_ctrl_gettext.cmo vc_connections.cmi \
-    ../libvirt/libvirt.cmi vc_domain_ops.cmi 
-vc_domain_ops.cmx: virt_ctrl_gettext.cmx vc_connections.cmx \
-    ../libvirt/libvirt.cmx vc_domain_ops.cmi 
-vc_helpers.cmo: virt_ctrl_gettext.cmo ../libvirt/libvirt.cmi vc_helpers.cmi 
-vc_helpers.cmx: virt_ctrl_gettext.cmx ../libvirt/libvirt.cmx vc_helpers.cmi 
+vc_domain_ops.cmo: virt_ctrl_gettext.cmo vc_connections.cmi vc_domain_ops.cmi 
+vc_domain_ops.cmx: virt_ctrl_gettext.cmx vc_connections.cmx vc_domain_ops.cmi 
+vc_helpers.cmo: virt_ctrl_gettext.cmo vc_helpers.cmi 
+vc_helpers.cmx: virt_ctrl_gettext.cmx vc_helpers.cmi 
 vc_icons.cmo: vc_connection_dlg.cmi 
 vc_icons.cmx: vc_connection_dlg.cmx 
 vc_mainwindow.cmo: virt_ctrl_gettext.cmo vc_connections.cmi \
-    vc_connection_dlg.cmi ../libvirt/libvirt.cmi vc_mainwindow.cmi 
+    vc_connection_dlg.cmi vc_mainwindow.cmi 
 vc_mainwindow.cmx: virt_ctrl_gettext.cmx vc_connections.cmx \
-    vc_connection_dlg.cmx ../libvirt/libvirt.cmx vc_mainwindow.cmi 
+    vc_connection_dlg.cmx vc_mainwindow.cmi 
 virt_ctrl.cmo: virt_ctrl_gettext.cmo vc_mainwindow.cmi vc_domain_ops.cmi 
 virt_ctrl.cmx: virt_ctrl_gettext.cmx vc_mainwindow.cmx vc_domain_ops.cmx 

diff --git a/virt-ctrl/Makefile.in b/virt-ctrl/Makefile.in
index 7e7c5c4..625afda 100644 (file)
--- a/virt-ctrl/Makefile.in
+++ b/virt-ctrl/Makefile.in
@@ -39,9 +39,7 @@ OBJS          := \
        vc_connection_dlg.cmo \
        vc_mainwindow.cmo
 
-ifneq ($(OCAMLFIND),)
-# Good, we have ocamlfind.
-OCAMLCPACKAGES := -I ../libvirt -package unix,lablgtk2
+OCAMLCPACKAGES := -package unix,lablgtk2,libvirt
 ifeq ($(pkg_dbus),yes)
 OCAMLCPACKAGES  += -package dbus
 OBJS            += vc_dbus.cmo
@@ -54,23 +52,11 @@ OCAMLCLIBS  := -linkpkg
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS  :=
 OCAMLOPTLIBS   := $(OCAMLCLIBS)
-else
-# Bad boy, please install ocamlfind.
-OCAMLCINCS     := -I ../libvirt -I @pkg_lablgtk2@
-OCAMLCFLAGS    := -g
-OCAMLCLIBS     := unix.cma lablgtk.cma
-OCAMLOPTINCS   := $(OCAMLCINCS)
-OCAMLOPTFLAGS  :=
-OCAMLOPTLIBS   := unix.cmxa lablgtk.cmxa
-endif
 
 ifneq ($(with_icons),no)
 OBJS           += vc_icons.cmo
 endif
 
-export LIBRARY_PATH=../libvirt
-export LD_LIBRARY_PATH=../libvirt
-
 BYTE_TARGETS   := virt-ctrl
 OPT_TARGETS    := virt-ctrl.opt
 
@@ -85,16 +71,16 @@ opt: $(OPT_TARGETS)
 ifneq ($(OCAMLFIND),)
 virt-ctrl: $(OBJS)
        $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-         ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
+         gtkInit.cmo -o $@ $^
 
 virt-ctrl.opt: $(XOBJS)
        $(OCAMLFIND) ocamlopt \
          $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-         ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
+         gtkInit.cmx -o $@ $^
 else
 virt-ctrl: $(OBJS)
        $(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-         ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
+         gtkInit.cmo -o $@ $^
 
 host_os                = @host_os@
 
@@ -102,7 +88,7 @@ ifneq ($(host_os),mingw32)
 virt-ctrl.opt: $(XOBJS)
        $(OCAMLOPT) $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
          $(patsubst %,-cclib %,$(LDFLAGS)) \
-         ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
+         gtkInit.cmx -o $@ $^
 else
 # On MinGW, use a hacked 'gcc' wrapper which understands the @...
 # syntax for extending the command line.
@@ -113,7 +99,7 @@ virt-ctrl.opt: $(XOBJS) gcc.exe
        PATH=.:$$PATH \
        $(OCAMLOPT) $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
          $(patsubst %,-cclib %,$(LDFLAGS)) \
-         ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $(XOBJS)
+         gtkInit.cmx -o $@ $(XOBJS)
 endif
 endif