modified Makefiles.

diff --git a/Makefile b/Makefile
index 50627c9..168bf75 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ PACKAGE_NAME = nkf
 all: nkf.cma nkf.cmxa
 
 nkf.cma: nkf.cmo libnkf.a
-       ocamlc -a -o $@ -custom $< -dllib -lnkf
+       ocamlc -a -o $@ $< -dllib -lnkf
 
 nkf.cmxa: nkf.cmx libnkf.a
        ocamlopt -a -o $@ $< -cclib -lnkf

diff --git a/test/Makefile b/test/Makefile
index 8f4d9fd..5812428 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,26 +1,26 @@
 .PHONY: all clean
 
-PKG = -package oUnit
+PKG = -package oUnit,nkf
 
 all: test.run test.opt
 
 test.run: test.cmo
-       ocamlfind ocamlc -I .. -linkpkg $(PKG) -o $@ nkf.cma $<
+       ocamlfind ocamlc -linkpkg $(PKG) -o $@ nkf.cma $<
 
 test.opt: test.cmx
-       ocamlfind ocamlopt -I .. -linkpkg $(PKG) -o $@ nkf.cmxa $<
+       ocamlfind ocamlopt -linkpkg $(PKG) -o $@ nkf.cmxa $<
 
 test.cmo: test.ml test.cmi
-       ocamlfind ocamlc -c -I .. $(PKG) $<
+       ocamlfind ocamlc -c $(PKG) $<
 
 test.cmx: test.ml test.cmi
-       ocamlfind ocamlopt -c -I .. $(PKG) $<
+       ocamlfind ocamlopt -c $(PKG) $<
 
 test.cmi: test.mli
-       ocamlfind ocamlc -c  $(PKG) $<
+       ocamlfind ocamlc -c $(PKG) $<
 
 test.mli: test.ml
-       ocamlfind ocamlc -i -I .. $(PKG) $< > $@
+       ocamlfind ocamlc -i $(PKG) $< > $@
 
 clean:
        rm -f *.mli *.cm[iox] *.o test.run test.opt