Commits

camlspotter committed 8cb9324 Draft

makefile fix

Comments (0)

Files changed (3)

+clean:
+	cd camljava-0.3; $(MAKE) clean
+	cd ojacare; $(MAKE) clean
+
+install:
+	cd camljava-0.3; $(MAKE) all opt install
+	cd ojacare; $(MAKE) all install
+
+uninstall:
+	ocamlfind remove camljava
+all:
+	make -C src depend
+	make -C src all
+
+install:
+	make -C src install
+
+clean:
+	make -C src clean

ojacare/Makefile.config

 #	$Id: Makefile.config,v 1.2 2004/03/19 20:42:56 henry Exp $
 
 
+PACKAGES = -package camljava
+
 # Adjust to your O'Caml installation 
-OCAMLC = ocamlc.opt -annot
-OCAMLOPT = ocamlopt.opt -annot
+OCAMLC = ocamlfind ocamlc -annot $(PACKAGES)
+OCAMLOPT = ocamlfind ocamlopt -annot $(PACKAGES)
 OCAMLMKLIB = ocamlmklib
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
-OCAMLDEP = ocamldep 
+OCAMLDEP = ocamlfind ocamldep 
 OCAMLMKTOP = ocamlmktop
 
 
 # Adjust to your 'camljava' installation
-CAMLJAVADIR = $(shell $(OCAMLC) -where)/camljava
+CAMLJAVADIR = $(shell ocamlfind printconf destdir)/camljava
 
 
 # Adjust to where you want to install O'Jacare
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
-LIBDIR = $(shell $(OCAMLC) -where)/ojacare
+# switches for camljava is supplied by ocamlfind
+LIBDIR = $(CAMLJAVADIR)