X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=mlvirtmanager%2FMakefile.in;h=b9bf280f9e8403276041b35e5fbd2b750a175d6a;hp=5bcb84cf60eb3d1a21b434c0d27d200fcd76ad57;hb=40cca545e1e010e8ee1a4ed4e9636b7c0119d5a2;hpb=3126bfee333b5c635dc60a54265936af06117f6a

diff --git a/mlvirtmanager/Makefile.in b/mlvirtmanager/Makefile.in
old mode 100755
new mode 100644
index 5bcb84c..b9bf280
--- a/mlvirtmanager/Makefile.in
+++ b/mlvirtmanager/Makefile.in
@@ -21,13 +21,23 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
+OCAMLFIND	= @OCAMLFIND@
+
+ifneq ($(OCAMLFIND),)
 OCAMLCPACKAGES	:= -package unix,lablgtk2 -I ../libvirt
 OCAMLCFLAGS	:= -g
 OCAMLCLIBS	:= -linkpkg
-
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS	:=
 OCAMLOPTLIBS	:= $(OCAMLCLIBS)
+else
+OCAMLCINCS	:= -I @pkg_lablgtk2@ -I ../libvirt
+OCAMLCFLAGS	:= -g
+OCAMLCLIBS	:= unix.cma lablgtk.cma
+OCAMLOPTINCS	:= $(OCAMLCINCS)
+OCAMLOPTFLAGS	:=
+OCAMLOPTLIBS	:= unix.cmxa lablgtk.cmxa
+endif
 
 export LIBRARY_PATH=../libvirt
 export LD_LIBRARY_PATH=../libvirt
@@ -48,14 +58,25 @@ all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
+ifneq ($(OCAMLFIND),)
 mlvirtmanager: $(VIRTMANAGER_OBJS)
-	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $<
+	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+	  ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
 
 mlvirtmanager.opt: $(VIRTMANAGER_XOBJS)
-	ocamlfind ocamlopt \
+	$(OCAMLFIND) ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $<
+	  ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
+else
+mlvirtmanager: $(VIRTMANAGER_OBJS)
+	$(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+	  ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
+
+mlvirtmanager.opt: $(VIRTMANAGER_XOBJS)
+	$(OCAMLOPT) -verbose $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+	  -cclib "$(LDFLAGS)" \
+	  ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
+endif
 
 install:
 	if [ -x mlvirtmanager.opt ]; then \