Skip to content

Commit

Permalink
remove binary
Browse files Browse the repository at this point in the history
  • Loading branch information
raphael-proust committed Feb 21, 2014
1 parent 1acc59a commit 36e92f3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 188 deletions.
2 changes: 1 addition & 1 deletion META
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "o9p"
version = "0.4"
version = "0.4.1"
description = "9P library implementation in OCaml"
requires = "unix, str"
archive(byte) = "o9p.cma"
Expand Down
17 changes: 3 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,45 +17,34 @@ PREFIX = /usr/local

# Sources
LIBSRC = lib/fcall.ml lib/o9pc.ml
CLSRC = src/client.ml

# The output to create
CLIENT = o9pc
LIB = o9p.cma
LIBX = o9p.cmxa

NAME=o9p

# Automagic stuff below

LIBOBJ = $(patsubst %.ml,%.cmo,$(LIBSRC))
LIBXOBJ = $(patsubst %.ml,%.cmx,$(LIBSRC))
CLOBJ = $(patsubst %.ml,%.cmx,$(CLSRC))
LIBCMI = $(patsubst %.ml,%.cmi,$(LIBSRC))
LIBMLI = $(patsubst %.ml,%.mli,$(LIBSRC))

all: $(LIB) $(LIBX) $(CLIENT)
all: $(LIB) $(LIBX)

.PHONY: install
install: all
$(OCAMLFIND) install $(NAME) $(LIB) $(LIBCMI) $(NAME).a $(LIBX) META
install -d $(DESTDIR)$(PREFIX)/bin/
install $(CLIENT) $(DESTDIR)$(PREFIX)/bin/$(CLIENT)

.PHONY: uninstall
uninstall:
$(OCAMLFIND) remove $(NAME)
rm -f $(DESTDIR)$(PREFIX)/bin/$(CLIENT)

$(LIB): $(LIBCMI) $(LIBOBJ)
$(OCAMLFIND) $(OCAMLC) -a -o $@ -package "$(REQUIRES)" -linkpkg $(LIBOBJ)

$(LIBX): $(LIBCMI) $(LIBXOBJ)
$(OCAMLFIND) $(OCAMLOPT) -a -o $@ -package "$(REQUIRES)" $(LIBXOBJ)

$(CLIENT): $(CLOBJ)
$(OCAMLFIND) $(OCAMLOPT) -package "$(REQUIRES)" -linkpkg -o $@ $(LIBX) $^

%.cmo: %.ml
$(OCAMLFIND) $(OCAMLC) -c $(INCLUDES) -package "$(REQUIRES)" $<

Expand All @@ -70,5 +59,5 @@ htdoc: $(LIBCMI) $(LIBMLI)

.PHONY: clean
clean:
rm -f lib/*.cmo lib/*.cmx lib/*.cmi lib/*.o src/*.cmx src/*.cmi src/*.o \
$(LIB) $(LIBX) $(patsubst %.cmxa,%.a,$(LIBX)) $(CLIENT) doc/*
rm -f lib/*.cmo lib/*.cmx lib/*.cmi lib/*.o \
$(LIB) $(LIBX) $(patsubst %.cmxa,%.a,$(LIBX)) doc/*
173 changes: 0 additions & 173 deletions src/client.ml

This file was deleted.

0 comments on commit 36e92f3

Please sign in to comment.