From 7c5ff9eee393016f8aca13fd32e32977f512a65d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 28 Mar 2008 16:47:41 +0000
Subject: Make mlvirsh localizable.

---
 mlvirsh/Makefile.in | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'mlvirsh/Makefile.in')

diff --git a/mlvirsh/Makefile.in b/mlvirsh/Makefile.in
index 197f732..23d6e1e 100644
--- a/mlvirsh/Makefile.in
+++ b/mlvirsh/Makefile.in
@@ -21,6 +21,8 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
+pkg_gettext     = @pkg_gettext@
+
 OCAMLFIND	= @OCAMLFIND@
 
 ifneq ($(OCAMLFIND),)
@@ -39,6 +41,19 @@ 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
 
@@ -50,23 +65,23 @@ all: $(BYTE_TARGETS)
 opt: $(OPT_TARGETS)
 
 ifneq ($(OCAMLFIND),)
-mlvirsh: mlvirsh.cmo
+mlvirsh: $(OBJS)
 	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma -o $@ $<
+	  ../libvirt/mllibvirt.cma -o $@ $^
 
-mlvirsh.opt: mlvirsh.cmx
+mlvirsh.opt: $(XOBJS)
 	$(OCAMLFIND) ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa -o $@ $<
+	  ../libvirt/mllibvirt.cmxa -o $@ $^
 else
-mlvirsh: mlvirsh.cmo
+mlvirsh: $(OBJS)
 	$(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma -o $@ $<
+	  ../libvirt/mllibvirt.cma -o $@ $^
 
-mlvirsh.opt: mlvirsh.cmx
+mlvirsh.opt: $(XOBJS)
 	$(OCAMLOPT) \
 	  $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa -o $@ $<
+	  ../libvirt/mllibvirt.cmxa -o $@ $^
 endif
 
 install:
-- 
cgit 


From 02f1c03c9f81e25353aae4900ce19e194b507f71 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 16 Apr 2008 13:51:14 +0100
Subject: Removed virt-ctrl, virt-df, ocaml-libvirt - now in separate
 repositories.

---
 mlvirsh/Makefile.in | 93 -----------------------------------------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 mlvirsh/Makefile.in

(limited to 'mlvirsh/Makefile.in')

diff --git a/mlvirsh/Makefile.in b/mlvirsh/Makefile.in
deleted file mode 100644
index 23d6e1e..0000000
--- a/mlvirsh/Makefile.in
+++ /dev/null
@@ -1,93 +0,0 @@
-# mlvirsh
-# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-INSTALL		:= @INSTALL@
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-bindir		= @bindir@
-
-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
-
-BYTE_TARGETS	:= mlvirsh
-OPT_TARGETS	:= mlvirsh.opt
-
-all: $(BYTE_TARGETS)
-
-opt: $(OPT_TARGETS)
-
-ifneq ($(OCAMLFIND),)
-mlvirsh: $(OBJS)
-	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma -o $@ $^
-
-mlvirsh.opt: $(XOBJS)
-	$(OCAMLFIND) ocamlopt \
-	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../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 \
-	  mkdir -p $(DESTDIR)$(bindir); \
-	  $(INSTALL) -m 0755 mlvirsh.opt $(DESTDIR)$(bindir)/mlvirsh; \
-	fi
-
-include ../Make.rules
-- 
cgit