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

Signed-off-by: Thomas Gazagnaire <thomas.gazagnaire@citrix.com>

diff --git a/close-and-exec/Makefile b/close-and-exec/Makefile
index 0834d71d0798320386d23c390da928627e40949c..54848ed7df0899ac34389488dd7c6247cca4b51b 100644 (file)
--- a/close-and-exec/Makefile
+++ b/close-and-exec/Makefile
@@ -1,4 +1,3 @@
-IPROG=install -m 755 -o root -g root
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
@@ -6,7 +5,7 @@ OCAMLOPT = ocamlopt
 
 LDFLAGS = -cclib -L./
 
-LIBEXEC  = "/opt/xensource/libexec"
+DESTDIR ?= /
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes
 
@@ -20,16 +19,14 @@ LIBS = closeandexec.cmxa closeandexec.cma
 
 PROGRAMS = closeandexec
 
-DOCDIR = /myrepos/xen-api-libs.hg/doc
-
 all: $(INTF) $(LIBS)
 
 bins: $(PROGRAMS)
 
 libs: $(LIBS)
 
-closeandexec: closeandexec.cmxa closeandexec_main.cmx all
-       $(OCAMLOPT) $(OCAMLOPTFLAGS) -thread -I ../stdext -I ../uuid uuid.cmxa unix.cmxa threads.cmxa stdext.cmxa closeandexec.cmxa closeandexec_main.cmx -o $@ 
+closeandexec: closeandexec.cmxa all
+       $(OCAMLOPT) $(OCAMLOPTFLAGS) closeandexec.cmxa -o $@ $<
 
 closeandexec.cmxa: $(foreach obj,$(OBJS),$(obj).cmx)
        $(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmx)
@@ -53,28 +50,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 close-and-exec META $(INTF) $(LIBS) *.a *.cmx
-
-.PHONY: bininstall
-bininstall: path = $(DESTDIR)$(LIBEXEC)
-bininstall: all
-       mkdir -p $(path)
-       $(IPROG) $(PROGRAMS) $(path)
+       ocamlfind install -destdir $(DESTDIR)$(shell ocamlfind printconf destdir) -ldconf ignore close-and-exec META $(INTF) $(LIBS) *.a *.cmx
 
 .PHONY: uninstall
 uninstall:
        ocamlfind remove close-and-exec
 
-.PHONY: binuninstall
-binuninstall:
-       rm -f $(DESTDIR)$(LIBEXEC)$(PROGRAMS)
-
-.PHONY: doc
-doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "close-and-exec" "library" "$(OBJS)" "." "stdext" ""
-
 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