New Makefile for libsndfile-ocaml library integration; Makefiles chain modified.

[Faustine.git] / interpretor / lib / src / libsndfile-ocaml / Makefile

diff --git a/interpretor/lib/src/libsndfile-ocaml/Makefile b/interpretor/lib/src/libsndfile-ocaml/Makefile
index 299214a..8df3b1e 100644 (file)
--- a/interpretor/lib/src/libsndfile-ocaml/Makefile
+++ b/interpretor/lib/src/libsndfile-ocaml/Makefile
@@ -1,6 +1,7 @@
+LIBSNDFILEDIR = ../../libsndfile/lib #/home/erikd/Local/lib

 
 CC = gcc
 
 CC = gcc

-CFLAGS = -g -W -Wall -Werror
+CFLAGS = -g -W -Wall -Werror -Wno-missing-field-initializers

 
 OCAMLC = ocamlc
 OCAMLOPT = ocamlopt
 
 OCAMLC = ocamlc
 OCAMLOPT = ocamlopt


@@ -10,9 +11,11 @@ OCAMLDOC = ocamldoc
 SNDFILE_CFLAGS = $(shell pkg-config --cflags sndfile)
 SNDFILE_LIBS = $(shell pkg-config --libs sndfile)
 
 SNDFILE_CFLAGS = $(shell pkg-config --cflags sndfile)
 SNDFILE_LIBS = $(shell pkg-config --libs sndfile)
 

-OCAML_CFLAGS = -I /usr/lib/ocaml/$(shell ocamlopt -version)
+OCAML_BINDIR = $(shell which ocaml)
+OCAML_LIBDIR = $(subst bin,lib,$(OCAML_BINDIR))
+OCAML_CFLAGS = -I $(OCAML_LIBDIR) #/usr/lib/ocaml/$(shell ocamlopt -version)

 
 

-LIBSNDFILE = -ccopt -L/home/erikd/Local/lib -cclib -lsndfile -cclib -lm
+LIBSNDFILE = -ccopt -L$(LIBSNDFILEDIR) -cclib -lsndfile -cclib -lm

 
 all: sndfile.cma sndfile.cmxa
 
 
 all: sndfile.cma sndfile.cmxa