Commits

camlspotter committed e8604c3 Draft

ocamlfind

Comments (0)

Files changed (3)

ojacare/examples/Makefile.config

 OCAMLMKTOP = ocamlmktop
 
 OJACARE = ojacare
-OJACAREDIR = $(shell $(OCAMLC) -where)/ojacare
+OJACAREDIR = $(shell ocamlfind printconf destdir)/ojacare
 
-CAMLJAVADIR = $(shell $(OCAMLC) -where)/camljava
+CAMLJAVADIR = $(shell ocamlfind printconf destdir)/camljava

ojacare/examples/point/Makefile

 # Liste des classes Java ayant l'attribut callback 
 CBCLASS   = mypack/ColoredPoint
 
-include $(OJACAREDIR)/Makefile.include
+include $(OJACAREDIR)/Makefile.include

ojacare/src/main/Makefile.include

 
 ### Adjust to your installation
 
-# OCAMLC      = ocamlc
-# OCAMLOPT    = ocamlopt.opt 
+OCAMLC      = ocamlfind ocamlc
+OCAMLOPT    = ocamlfind ocamlopt
 # OCAMLMKLIB  = ocamlmklib
 # OCAMLLEX    = ocamllex
 # OCAMLYACC   = ocamlyacc
 # OCAMLDEP    = ocamldep 
-# OCAMLMKTOP  = ocamlmktop
+OCAMLMKTOP  = ocamlfind ocamlmktop
 
 # OJACARE     = ojacare
 # OJACAREDIR  = $(shell $(OCAMLC) -where)/ojacare
 
 include $(CAMLJAVADIR)/Makefile.config
 
+PACKAGES      = -package camljava,ojacare
+
 CMI_OBJS      = $(addsuffix .cmi, $(IDL))
 CMO_OBJS      = $(addsuffix .cmo, $(IDL)) $(addsuffix .cmo, $(MODULES))
 CMX_OBJS      = $(addsuffix .cmx, $(IDL)) $(addsuffix .cmx, $(MODULES))
-CMA_OBJS      = jni.cma jnihelpers.cma $(addsuffix .cma, $(LIBRARIES)) 
-CMXA_OBJS     = jni.cmxa jnihelpers.cmxa $(addsuffix .cmxa, $(LIBRARIES))
+CMA_OBJS      = $(addsuffix .cma, $(LIBRARIES)) 
+CMXA_OBJS     = $(addsuffix .cmxa, $(LIBRARIES))
 CLASS_FILES   = $(addsuffix .class, $(CLASS))
 CBCLASS_FILES = $(addsuffix .class,$(addprefix callback/,$(CBCLASS)))
 IDL_FILES     = $(addsuffix .idl, $(IDL))
 BYTE_OBJS = $(CMA_OBJS) $(CMO_OBJS)
 OPT_OBJS  = $(CMXA_OBJS) $(CMX_OBJS)
 
-INCLUDES  = -I $(CAMLJAVADIR) -I $(OJACAREDIR) $(addprefix -I , $(MLINCDIRS))
-LINK_OPTS = $(addprefix -ccopt -L, $(CLIBDIRS)) \
+INCLUDES  = $(PACKAGES) $(addprefix -I , $(MLINCDIRS))
+LINK_OPTS = -linkpkg $(addprefix -ccopt -L, $(CLIBDIRS)) \
 	    $(addprefix -cclib -l, $(CLIBS))
 
 all: byte opt toplevel
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.