1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
|
From: Stephane Glondu <steph@glondu.net>
Date: Mon, 7 Sep 2009 09:48:24 +0200
Subject: Examples
Make examples easily buildable in Debian, by relying on
lib dir post-installation (i.e. `ocamlc -where`/postgresql).
Signed-off-by: Stefano Zacchiroli <zack@debian.org>
Signed-off-by: Stephane Glondu <steph@glondu.net>
---
examples/cursor/Makefile | 4 ++--
examples/dump/Makefile | 4 ++--
examples/populate/Makefile | 4 ++--
examples/prompt/Makefile | 4 ++--
examples/prompt_gtk/Makefile | 4 ++--
examples/test_lo/Makefile | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/examples/cursor/Makefile b/examples/cursor/Makefile
index 7138b8a..ae61d7f 100644
--- a/examples/cursor/Makefile
+++ b/examples/cursor/Makefile
@@ -1,8 +1,8 @@
OCAMLMAKEFILE = ../../OCamlMakefile
SOURCES = cursor.ml
-INCDIRS = ../../lib
-LIBDIRS = ../../lib
+INCDIRS := $(shell ocamlc -where)/postgresql
+LIBDIRS := $(shell ocamlc -where)/postgresql
LIBS = postgresql
RESULT = cursor
diff --git a/examples/dump/Makefile b/examples/dump/Makefile
index e07a1b0..8d4db77 100644
--- a/examples/dump/Makefile
+++ b/examples/dump/Makefile
@@ -1,8 +1,8 @@
OCAMLMAKEFILE = ../../OCamlMakefile
SOURCES = dump.ml
-INCDIRS = ../../lib
-LIBDIRS = ../../lib
+INCDIRS := $(shell ocamlc -where)/postgresql
+LIBDIRS := $(shell ocamlc -where)/postgresql
LIBS = postgresql
RESULT = dump
diff --git a/examples/populate/Makefile b/examples/populate/Makefile
index f2674a2..380212e 100644
--- a/examples/populate/Makefile
+++ b/examples/populate/Makefile
@@ -1,8 +1,8 @@
OCAMLMAKEFILE = ../../OCamlMakefile
SOURCES = populate.ml
-INCDIRS = ../../lib
-LIBDIRS = ../../lib
+INCDIRS := $(shell ocamlc -where)/postgresql
+LIBDIRS := $(shell ocamlc -where)/postgresql
LIBS = postgresql
RESULT = populate
diff --git a/examples/prompt/Makefile b/examples/prompt/Makefile
index 37e438f..1dbac4e 100644
--- a/examples/prompt/Makefile
+++ b/examples/prompt/Makefile
@@ -1,8 +1,8 @@
OCAMLMAKEFILE = ../../OCamlMakefile
SOURCES = prompt.ml
-INCDIRS = ../../lib
-LIBDIRS = ../../lib
+INCDIRS := $(shell ocamlc -where)/postgresql
+LIBDIRS := $(shell ocamlc -where)/postgresql
LIBS = postgresql
THREADS = yes
RESULT = prompt
diff --git a/examples/prompt_gtk/Makefile b/examples/prompt_gtk/Makefile
index b24d536..8947bc8 100644
--- a/examples/prompt_gtk/Makefile
+++ b/examples/prompt_gtk/Makefile
@@ -1,8 +1,8 @@
OCAMLMAKEFILE = ../../OCamlMakefile
SOURCES = prompt_gtk.ml
-INCDIRS = ../../lib
-LIBDIRS = ../../lib
+INCDIRS := $(shell ocamlc -where)/postgresql
+LIBDIRS := $(shell ocamlc -where)/postgresql
LIBS = postgresql
PACKS = lablgtk2
RESULT = prompt_gtk
diff --git a/examples/test_lo/Makefile b/examples/test_lo/Makefile
index d1441e8..fc46218 100644
--- a/examples/test_lo/Makefile
+++ b/examples/test_lo/Makefile
@@ -1,8 +1,8 @@
OCAMLMAKEFILE = ../../OCamlMakefile
SOURCES = test_lo.ml
-INCDIRS = ../../lib
-LIBDIRS = ../../lib
+INCDIRS := $(shell ocamlc -where)/postgresql
+LIBDIRS := $(shell ocamlc -where)/postgresql
LIBS = postgresql
RESULT = test_lo
--
|