X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=mlvirsh%2FMakefile.in;h=23d6e1e1a09517cdaa1b2ebc6cf0990536919c74;hb=46d3772c9a5cf786fa4fbdb2ba29512580101f32;hp=6976e166c679dcfb8645ed7696f74714ad4f21f3;hpb=3126bfee333b5c635dc60a54265936af06117f6a;p=virt-top.git

diff --git a/mlvirsh/Makefile.in b/mlvirsh/Makefile.in
old mode 100755
new mode 100644
index 6976e16..23d6e1e
--- a/mlvirsh/Makefile.in
+++ b/mlvirsh/Makefile.in
@@ -21,13 +21,38 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
-OCAMLCPACKAGES	:= -package extlib,unix -I ../libvirt
+pkg_gettext     = @pkg_gettext@
+
+OCAMLFIND	= @OCAMLFIND@
+
+ifneq ($(OCAMLFIND),)
+OCAMLCPACKAGES	:= -package unix -I ../libvirt
 OCAMLCFLAGS	:= -g
 OCAMLCLIBS	:= -linkpkg
-
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS	:=
 OCAMLOPTLIBS	:= $(OCAMLCLIBS)
+else
+OCAMLCINCS	:= -I ../libvirt
+OCAMLCFLAGS	:= -g
+OCAMLCLIBS	:= unix.cma
+OCAMLOPTINCS	:= $(OCAMLCINCS)
+OCAMLOPTFLAGS	:=
+OCAMLOPTLIBS	:= unix.cmxa
+endif
+
+ifneq ($(pkg_gettext),no)
+ifneq ($(OCAMLFIND),)
+OCAMLCPACKAGES  += -package gettext-stub
+OCAMLOPTPACKAGES  += -package gettext-stub
+else
+OCAMLCINCS	+= -I gettext -I gettext-stub
+OCAMLOPTINCS	+= -I gettext -I gettext-stub
+endif
+endif
+
+OBJS		:= mlvirsh_gettext.cmo mlvirsh.cmo
+XOBJS		:= $(OBJS:.cmo=.cmx)
 
 export LIBRARY_PATH=../libvirt
 export LD_LIBRARY_PATH=../libvirt
@@ -39,14 +64,25 @@ all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
-mlvirsh: mlvirsh.cmo
-	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma -o $@ $<
+ifneq ($(OCAMLFIND),)
+mlvirsh: $(OBJS)
+	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+	  ../libvirt/mllibvirt.cma -o $@ $^
 
-mlvirsh.opt: mlvirsh.cmx
-	ocamlfind ocamlopt \
+mlvirsh.opt: $(XOBJS)
+	$(OCAMLFIND) ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa -o $@ $<
+	  ../libvirt/mllibvirt.cmxa -o $@ $^
+else
+mlvirsh: $(OBJS)
+	$(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+	  ../libvirt/mllibvirt.cma -o $@ $^
+
+mlvirsh.opt: $(XOBJS)
+	$(OCAMLOPT) \
+	  $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+	  ../libvirt/mllibvirt.cmxa -o $@ $^
+endif
 
 install:
 	if [ -x mlvirsh.opt ]; then \