summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1999-11-18 13:14:27 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1999-11-18 13:14:27 +0000
commite167b62db646c6b206b04468fbb3bced97e7b99c (patch)
treee8469efe4ebd452de21feb6715a93c6db3a41a85
parent3cde3fd94223b03e9c7f87878d5ea3228595b231 (diff)
MAJ exemple cm
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2561 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--test/Moretest/Makefile2
-rw-r--r--test/Moretest/cmmain.c2
-rw-r--r--test/Moretest/cmstub.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/test/Moretest/Makefile b/test/Moretest/Makefile
index 89c048c22..50d06c8c0 100644
--- a/test/Moretest/Makefile
+++ b/test/Moretest/Makefile
@@ -43,7 +43,7 @@ cmlinked.out: cmcaml.ml cmstub.c cmmain.c
cm.out: cmcaml.ml cmstub.c cmmain.c
$(CAMLOPT) -output-obj -o cm.o cmcaml.ml
- $(NATIVECC) -g -o cm.out cm.o -I../../byterun -DNO_BYTECODE_FILE cmstub.c cmmain.c ../../asmrun/libasmrun.a $(CCLIBS)
+ $(NATIVECC) -g -o cm.out cm.o -I$(LIBDIR) -DNO_BYTECODE_FILE cmstub.c cmmain.c ../../asmrun/libasmrun.a $(CCLIBS)
# Common rules
diff --git a/test/Moretest/cmmain.c b/test/Moretest/cmmain.c
index 1686f981a..4894361b2 100644
--- a/test/Moretest/cmmain.c
+++ b/test/Moretest/cmmain.c
@@ -1,7 +1,7 @@
/* Main program -- in C */
#include <stdlib.h>
-#include <callback.h>
+#include <caml/callback.h>
extern int fib(int n);
extern char * format_result(int n);
diff --git a/test/Moretest/cmstub.c b/test/Moretest/cmstub.c
index 9bd9ff89f..56cd69443 100644
--- a/test/Moretest/cmstub.c
+++ b/test/Moretest/cmstub.c
@@ -1,6 +1,6 @@
#include <string.h>
-#include <mlvalues.h>
-#include <callback.h>
+#include <caml/mlvalues.h>
+#include <caml/callback.h>
/* Functions callable directly from C */