diff options
| -rw-r--r-- | byterun/Makefile | 4 | ||||
| -rw-r--r-- | byterun/Makefile.Mac | 5 | ||||
| -rw-r--r-- | byterun/Makefile.nt | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/byterun/Makefile b/byterun/Makefile index 840a52da4..5d504e5f7 100644 --- a/byterun/Makefile +++ b/byterun/Makefile @@ -17,6 +17,8 @@ PRIMS=alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \ intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \ signals.c str.c sys.c terminfo.c callback.c weak.c +PUBLIC_INCLUDES=mlvalues.h alloc.h misc.h callback.h fail.h + all: ocamlrun ocamlrun: libcamlrun.a prims.o @@ -30,7 +32,7 @@ install: cp libcamlrun.a $(LIBDIR)/libcamlrun.a cd $(LIBDIR); $(RANLIB) libcamlrun.a if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi - cp mlvalues.h alloc.h misc.h callback.h $(LIBDIR)/caml + cp $(PUBLIC_INCLUDES) $(LIBDIR)/caml sed -e '/#include ".*\/m.h/r ../config/m.h' \ -e '/#include ".*\/s.h/r ../config/s.h' \ -e '/#include "/d' config.h > $(LIBDIR)/caml/config.h diff --git a/byterun/Makefile.Mac b/byterun/Makefile.Mac index 64cb99f69..2eeb4f121 100644 --- a/byterun/Makefile.Mac +++ b/byterun/Makefile.Mac @@ -35,6 +35,8 @@ PRIMS = array.c compare.c extern.c floats.c gc_ctrl.c hash.c ¶ intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c ¶ signals.c str.c sys.c terminfo.c callback.c weak.c +PUBLIC_INCLUDES = mlvalues.h alloc.h misc.h callback.h fail.h + all Ä ocamlrun libcamlrun.o libcamlrun.x ocamlrun ÄÄ libcamlrun.o prims.c.o @@ -57,8 +59,7 @@ install Ä if "`exists -d "{LIBDIR}caml:"`" == "" newfolder "{LIBDIR}caml:" end - duplicate -y mlvalues.h alloc.h misc.h callback.h config.h memory.h ¶ - "{LIBDIR}caml:" + duplicate -y {PUBLIC_INCLUDES} "{LIBDIR}caml:" open -t "{LIBDIR}caml:config.h" find ¥ "{LIBDIR}caml:config.h" find /Å'#include "'Åsm-Mac.hÅ°/ "{LIBDIR}caml:config.h" diff --git a/byterun/Makefile.nt b/byterun/Makefile.nt index 165a5a765..c4e83f3d7 100644 --- a/byterun/Makefile.nt +++ b/byterun/Makefile.nt @@ -14,6 +14,8 @@ PRIMS=array.c compare.c extern.c floats.c gc_ctrl.c hash.c \ intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \ signals.c str.c sys.c terminfo.c callback.c weak.c +PUBLIC_INCLUDES=mlvalues.h alloc.h misc.h callback.h fail.h + all: ocamlrun.exe ocamlrun.exe: libcamlrun.lib prims.obj @@ -23,7 +25,7 @@ install: cp ocamlrun.exe $(BINDIR)\ocamlrun.exe cp libcamlrun.lib $(LIBDIR)\libcamlrun.lib if not exist $(LIBDIR)\caml mkdir $(LIBDIR)\caml - cp mlvalues.h alloc.h misc.h callback.h $(LIBDIR)\caml + cp $(PUBLIC_INCLUDES) $(LIBDIR)\caml sed -e "/#include .*\/m.h/r ..\config\m.h" \ -e "/#include .*\/s.h/r ..\config\s.h" \ -e "/#include /d" config.h > $(LIBDIR)\caml\config.h |