From: David Scott <dave.scott@eu.citrix.com>
Date: Mon, 26 Oct 2009 16:32:15 +0000 (+0000)
Subject: [refactoring] Move RSS from xen-api.hg to xen-api-libs.hg
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=73a244c017a988ef82f5cba16b4c047471b739d3;p=xcp%2Fxen-api-libs.git

[refactoring] Move RSS from xen-api.hg to xen-api-libs.hg
---

diff --git a/rss/Makefile b/rss/Makefile
index e0c28a1..7458e07 100644
--- a/rss/Makefile
+++ b/rss/Makefile
@@ -5,6 +5,7 @@ OCAMLOPT = ocamlopt
 
 LDFLAGS = -cclib -L./
 
+DESTDIR ?= /
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes
 
@@ -16,8 +17,6 @@ OBJS = rss
 INTF = $(foreach obj, $(OBJS),$(obj).cmi)
 LIBS = rss.cma rss.cmxa
 
-DOCDIR = /myrepos/xen-api-libs.hg/doc
-
 all: $(INTF) $(LIBS) $(PROGRAMS)
 
 bins: $(PROGRAMS)
@@ -46,18 +45,12 @@ META: META.in
 	sed 's/@VERSION@/$(VERSION)/g' < $< > $@
 
 .PHONY: install
-install: path = $(DESTDIR)$(shell ocamlfind printconf destdir)
 install: $(LIBS) META
-	mkdir -p $(path)
-	ocamlfind install -destdir $(path) -ldconf ignore rss META $(INTF) $(LIBS) *.a *.cmx
+	ocamlfind install -destdir $(DESTDIR)$(shell ocamlfind printconf destdir) -ldconf ignore rss META $(INTF) $(LIBS) *.a *.cmx
 
 .PHONY: uninstall
 uninstall:
 	ocamlfind remove rss
 
-.PHONY: doc
-doc: $(INTF)
-	python ../doc/doc.py $(DOCDIR) "rss" "package" "$(OBJS)" "." "xml-light2" ""
-	
 clean:
-	rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)
+	rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)
\ No newline at end of file