diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2002-06-18 13:01:36 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2002-06-18 13:01:36 +0000 |
| commit | a64d03d619c7e7ef760683132ce6c156adaa20dc (patch) | |
| tree | 80ebb9ae6dc59c87001c6d5e23f4027b18c185c3 | |
| parent | 51e7c409ef46a0800e82966b188869558d070e08 (diff) | |
Suppression de la dependance sur io.h
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4932 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | otherlibs/win32unix/Makefile.nt | 20 | ||||
| -rw-r--r-- | otherlibs/win32unix/unixsupport.h | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/otherlibs/win32unix/Makefile.nt b/otherlibs/win32unix/Makefile.nt index edb8edc14..c59cef290 100644 --- a/otherlibs/win32unix/Makefile.nt +++ b/otherlibs/win32unix/Makefile.nt @@ -49,24 +49,19 @@ LIBS=$(call SYSLIB,wsock32) CAML_OBJS=unix.cmo unixLabels.cmo CAMLOPT_OBJS=$(CAML_OBJS:.cmo=.cmx) +UNIX_CAML_FILES = unix.mli unixLabels.mli unixLabels.ml + all: dllunix.dll libunix.$(A) unix.cma allopt: libunix.$(A) unix.cmxa -dllunix.dll: io.h $(DOBJS) +dllunix.dll: $(DOBJS) $(call MKDLL,dllunix.dll,tmp.$(A),$(DOBJS) ../../byterun/ocamlrun.$(A) $(LIBS)) rm tmp.* -libunix.$(A): io.h $(SOBJS) +libunix.$(A): $(SOBJS) $(call MKLIB,libunix.$(A),$(SOBJS)) -#copy_unix_files: -# @cd ../unix; cp -p -u $(UNIX_FILES) ../win32unix -# @cp ../unix/unix.mli ../unix/unixLabels.ml* . - -io.h: $(SYSTEM_INCLUDES)/io.h - cp "$(SYSTEM_INCLUDES)/io.h" io.h - $(DOBJS) $(SOBJS): unixsupport.h unix.cma: $(CAML_OBJS) @@ -82,8 +77,7 @@ partialclean: clean: partialclean rm -f *.$(A) *.dll *.$(O) - rm -f $(UNIX_FILES) - rm -f io.h + rm -f $(UNIX_FILES) $(UNIX_CAML_FILES) install: cp dllunix.dll $(LIBDIR)/dllunix.dll @@ -99,8 +93,8 @@ unixLabels.cmo: unixLabels.ml unixLabels.cmx: unixLabels.ml $(CAMLOPT) -c $(COMPFLAGS) -nolabels unixLabels.ml -$(UNIX_FILES): %.c: ../unix/%.c - cp ../unix/$*.c $*.c +$(UNIX_FILES) $(UNIX_CAML_FILES): %: ../unix/% + cp ../unix/$* $* .SUFFIXES: .ml .mli .cmo .cmi .cmx .$(DO) .$(SO) diff --git a/otherlibs/win32unix/unixsupport.h b/otherlibs/win32unix/unixsupport.h index a14731f40..8dcb45ae3 100644 --- a/otherlibs/win32unix/unixsupport.h +++ b/otherlibs/win32unix/unixsupport.h @@ -18,7 +18,7 @@ #include <stdlib.h> /* Include io.h in current dir, which is a copy of the system's io.h, not io.h from ../../byterun */ -#include "io.h" +/*#include "io.h"*/ #include <direct.h> #include <process.h> #include <sys/types.h> |