git://git.onelab.eu
/
vsys.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63e94af
)
Brought back build fixes for f12, which apparently got lost in the svn-git move
author
Sapan Bhatia
<gwsapan@gmail.com>
Thu, 16 Dec 2010 20:39:17 +0000
(15:39 -0500)
committer
Sapan Bhatia
<gwsapan@gmail.com>
Thu, 16 Dec 2010 20:39:17 +0000
(15:39 -0500)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
e271962
..
8231fa8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,4
+1,13
@@
-all: vsys
+#
+# $Id: Makefile 16196 2009-12-15 20:36:21Z thierry $
+# $URL: https://svn.planet-lab.org/svn/vsys/branches/0.9/Makefile $
+#
+
+# OCAML_OLD is set to non-empty if str.cmxa needs to be passed twice to the loader
+OCAML_RELEASE := $(shell ocaml -version)
+OCAML_OLD := $(strip $(findstring version 3.09,$(OCAML_RELEASE)) $(findstring version 3.10,$(OCAML_RELEASE)))
+
+all: vsys docs
include .dep
include .dep
@@
-25,7
+34,7
@@
include .dep
docs: *.ml
ocamldoc -d . -html -o docs *.ml
docs: *.ml
ocamldoc -d . -html -o docs *.ml
- m
kdir docs && m
v *.html *.css docs
+ mv *.html *.css docs
ocaml_inotify-0.4/inotify.cmxa:
$(MAKE) -C ocaml_inotify-0.4 && cp -f ocaml_inotify-0.4/inotify_stubs.o ./
ocaml_inotify-0.4/inotify.cmxa:
$(MAKE) -C ocaml_inotify-0.4 && cp -f ocaml_inotify-0.4/inotify_stubs.o ./
@@
-33,8
+42,12
@@
ocaml_inotify-0.4/inotify.cmxa:
splice_stub.o: splice_stub.c
gcc -c -I /usr/lib/ocaml -I /usr/lib64/ocaml splice_stub.c -o splice_stub.o
splice_stub.o: splice_stub.c
gcc -c -I /usr/lib/ocaml -I /usr/lib64/ocaml splice_stub.c -o splice_stub.o
-vsys: ocaml_inotify-0.4/inotify.cmxa globals.cmx fdwatcher.cmx conffile.cmx splice_stub.o splice.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx unixsocketwatcher.cmx backend.cmx main.cmx docs
+vsys: ocaml_inotify-0.4/inotify.cmxa globals.cmx fdwatcher.cmx conffile.cmx splice_stub.o splice.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx unixsocketwatcher.cmx backend.cmx main.cmx
+ifneq "$(OCAML_OLD)" ""
+ ocamlopt -I ocaml_inotify-0.4 str.cmxa unix.cmxa inotify.cmxa globals.cmx fdwatcher.cmx dirwatcher.cmx splice.cmx splice_stub.o directfifowatcher.cmx unixsocketwatcher.cmx frontend.cmx backend.cmx str.cmxa conffile.cmx main.cmx -o vsys
+else
ocamlopt -I ocaml_inotify-0.4 str.cmxa unix.cmxa inotify.cmxa globals.cmx fdwatcher.cmx dirwatcher.cmx splice.cmx splice_stub.o directfifowatcher.cmx unixsocketwatcher.cmx frontend.cmx backend.cmx conffile.cmx main.cmx -o vsys
ocamlopt -I ocaml_inotify-0.4 str.cmxa unix.cmxa inotify.cmxa globals.cmx fdwatcher.cmx dirwatcher.cmx splice.cmx splice_stub.o directfifowatcher.cmx unixsocketwatcher.cmx frontend.cmx backend.cmx conffile.cmx main.cmx -o vsys
+endif
vsys.b: ocaml_inotify-0.4/inotify.cma inotify.cmi globals.ml fdwatcher.ml dirwatcher.ml directfifowatcher.ml frontend.ml backend.ml main.ml
ocamlc -g str.cma unix.cma ocaml_inotify-0.4/inotify.cma globals.cmo fdwatcher.cmo dirwatcher.cmo directfifowatcher.cmo frontend.cmo backend.cmo str.cma conffile.cmo main.cmo -o vsys.b
vsys.b: ocaml_inotify-0.4/inotify.cma inotify.cmi globals.ml fdwatcher.ml dirwatcher.ml directfifowatcher.ml frontend.ml backend.ml main.ml
ocamlc -g str.cma unix.cma ocaml_inotify-0.4/inotify.cma globals.cmo fdwatcher.cmo dirwatcher.cmo directfifowatcher.cmo frontend.cmo backend.cmo str.cma conffile.cmo main.cmo -o vsys.b