Commits

camlspotter committed 86796a1

fix

  • Participants
  • Parent commits 3ee386d

Comments (0)

Files changed (2)

-SOURCES=misc.cmx tbl.cmx config.cmx clflags.cmx terminfo.cmx ccomp.cmx	\
-warnings.cmx consistbl.cmx linenum.cmx location.cmx longident.cmx	\
-syntaxerr.cmx parser.cmx lexer.cmx parse.cmx printast.cmx		\
-unused_var.cmx ident.cmx path.cmx primitive.cmx types.cmx btype.cmx	\
-oprint.cmx subst.cmx predef.cmx datarepr.cmx env.cmx typedtree.cmx	\
-ctype.cmx printtyp.cmx includeclass.cmx mtype.cmx includecore.cmx	\
-includemod.cmx parmatch.cmx typetexp.cmx stypes.cmx typecore.cmx	\
-typedecl.cmx typeclass.cmx typemod.cmx cmigrep.ml
+EXTRA=spot.cmo
 
 BYTESOURCES=misc.cmo tbl.cmo config.cmo clflags.cmo terminfo.cmo	\
 ccomp.cmo warnings.cmo consistbl.cmo linenum.cmo location.cmo		\
 printast.cmo unused_var.cmo ident.cmo path.cmo primitive.cmo types.cmo	\
 btype.cmo oprint.cmo subst.cmo predef.cmo datarepr.cmo env.cmo		\
 typedtree.cmo ctype.cmo printtyp.cmo includeclass.cmo mtype.cmo		\
-includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo	\
+includecore.cmo includemod.cmo parmatch.cmo $(EXTRA) typetexp.cmo stypes.cmo	\
 typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
 
+SOURCES=$(BYTESOURCES:.cmo=.cmx)
 
-GODI_CONF=$(shell godi_confdir)
-GODI_BASE=$(shell cat $(GODI_CONF)/godi.conf | grep ^LOCALBASE | sed -e 's/LOCALBASE *= *//')
-GODI_LIB=$(GODI_BASE)/lib/ocaml/compiler-lib
+OCAMLSOURCE=/home/jfuruse/.share/projects/ocaml
+OCAMLINCLUDES=-I $(OCAMLSOURCE)/typing -I $(OCAMLSOURCE)/utils -I $(OCAMLSOURCE)/parsing
 
 all:
-	ocamlfind ocamlopt -o cmigrep -I $(GODI_LIB) \
+	ocamlfind ocamlopt -o cmigrep $(OCAMLINCLUDES) \
 	-package pcre,findlib,unix -linkpkg $(SOURCES)
 
 byte:
-	ocamlfind ocamlc -o cmigrep -I $(GODI_LIB) \
+	ocamlfind ocamlc -o cmigrep $(OCAMLINCLUDES) \
 	-package pcre,findlib,unix -linkpkg $(BYTESOURCES)
 
 install:
     (function
        | Tsig_type (id, type_decl, _rec_status) ->
            begin match type_decl.type_kind with
-           | Type_variant (constructors, _private) ->
+           | Type_variant constructors ->
                List.iter
                  (fun (name, type_exprs) ->
                     if Pcre.pmatch ~rex:exp name then begin
     (function
        | Tsig_type (id, type_decl, _rec_status) ->
            begin match type_decl.type_kind with
-           | Type_record (labels, _, _) ->
+           | Type_record (labels, _) ->
                List.iter
                  (fun (name, mutable_flag, type_expr) ->
                     if Pcre.pmatch ~rex:exp name then begin