From 63edf4eeb3b8063bf9541dbc611dde73abf4ca56 Mon Sep 17 00:00:00 2001
From: gautier.hattenberger
Date: Wed, 7 Jan 2015 14:36:00 +0000
Subject: fix ctkivy and add tk part to makefile again

---
 examples/Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'examples/Makefile')

diff --git a/examples/Makefile b/examples/Makefile
index d110fd0..a25375e 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,11 +1,11 @@
 # $Id$
 
-OCAMLC = ocamlc -I .. 
-OCAMLMLI = ocamlc -I .. 
-OCAMLOPT = ocamlopt
-OCAMLDEP=ocamldep
+OCAMLC = ocamlfind ocamlc -I ..
+OCAMLMLI = ocamlfind ocamlc -I ..
+OCAMLOPT = ocamlfind ocamlopt
+OCAMLDEP = ocamlfind ocamldep
 
-all: ivyprobe.out glibivyprobe.out
+all: ivyprobe.out glibivyprobe.out tkivyprobe.out
 
 ivyprobe.out : ivyprobe.cmo ivyivyprobe.cmo
 	$(OCAMLC) -custom -o $@ unix.cma ivy-ocaml.cma $^
@@ -13,9 +13,11 @@ ivyprobe.out : ivyprobe.cmo ivyivyprobe.cmo
 glibivyprobe.out : ivyprobe.cmo glibivyprobe.cmo
 	$(OCAMLC) -custom -o $@ unix.cma glibivy-ocaml.cma $^
 
-#tkivyprobe.out : ivyprobe.cmo tkivyprobe.cmo
-#	$(OCAMLC) -custom -o $@ unix.cma -I +labltk labltk.cma -I . $^
-#tkivyprobe.cmo : OCAMLFLAGS=-I +labltk
+tkivyprobe.out : ivyprobe.cmo tkivyprobe.cmo
+	$(OCAMLC) -custom -o $@ unix.cma -I +labltk labltk.cma tkivy-ocaml.cma $^
+
+tkivyprobe.cmo : tkivyprobe.ml
+	$(OCAMLC) -package unix,labltk -c $<
 
 %.cmo : %.ml
 	$(OCAMLC) -c $<
-- 
cgit v1.1