diff options
| -rw-r--r-- | otherlibs/bigarray/Makefile.nt | 3 | ||||
| -rw-r--r-- | otherlibs/labltk/lib/Makefile.nt | 2 | ||||
| -rw-r--r-- | otherlibs/num/Makefile.nt | 2 | ||||
| -rw-r--r-- | otherlibs/str/Makefile.nt | 2 | ||||
| -rw-r--r-- | otherlibs/systhreads/Makefile.nt | 3 | ||||
| -rw-r--r-- | otherlibs/win32unix/Makefile.nt | 5 |
6 files changed, 11 insertions, 6 deletions
diff --git a/otherlibs/bigarray/Makefile.nt b/otherlibs/bigarray/Makefile.nt index 817dee292..9759dbf9e 100644 --- a/otherlibs/bigarray/Makefile.nt +++ b/otherlibs/bigarray/Makefile.nt @@ -37,7 +37,8 @@ libbigarray.lib: $(C_OBJS:.obj=.sobj) $(MKLIB)libbigarray.lib $(C_OBJS:.obj=.sobj) bigarray.cma: $(CAML_OBJS) - $(CAMLC) -a -linkall -o bigarray.cma $(CAML_OBJS) -cclib -lbigarray + $(CAMLC) -a -linkall -o bigarray.cma $(CAML_OBJS) \ + -dllib -lbigarray -cclib -lbigarray bigarray.cmxa: $(CAML_OBJS:.cmo=.cmx) $(CAMLOPT) -a -linkall -o bigarray.cmxa \ diff --git a/otherlibs/labltk/lib/Makefile.nt b/otherlibs/labltk/lib/Makefile.nt index 42674135d..d3dfffa5f 100644 --- a/otherlibs/labltk/lib/Makefile.nt +++ b/otherlibs/labltk/lib/Makefile.nt @@ -19,7 +19,7 @@ WIDGETOBJSX = $(WIDGETOBJS:.cmo=.cmx) labltk.cma : $(SUPPORT) $(WIDGETOBJS) tk.cmo $(LABLLIBR) -o labltk.cma $(SUPPORT) tk.cmo $(WIDGETOBJS) \ - -cclib -llabltk41 + -dllib -llabltk41 -cclib -llabltk41 $(TK_LINK) labltk.cmxa : $(SUPPORTX) $(WIDGETOBJSX) tk.cmx $(CAMLOPTLIBR) -o labltk.cmxa $(SUPPORTX) tk.cmx $(WIDGETOBJSX) \ diff --git a/otherlibs/num/Makefile.nt b/otherlibs/num/Makefile.nt index 827d7c905..436637eba 100644 --- a/otherlibs/num/Makefile.nt +++ b/otherlibs/num/Makefile.nt @@ -34,7 +34,7 @@ all: dllnums.dll libnums.lib nums.cma $(CMIFILES) allopt: libnums.lib nums.cmxa $(CMIFILES) nums.cma: $(CAMLOBJS) - $(CAMLC) -a -o nums.cma $(CAMLOBJS) -cclib -lnums + $(CAMLC) -a -o nums.cma $(CAMLOBJS) -dllib -lnums -cclib -lnums nums.cmxa: $(CAMLOBJS:.cmo=.cmx) $(CAMLOPT) -a -o nums.cmxa $(CAMLOBJS:.cmo=.cmx) -cclib -lnums diff --git a/otherlibs/str/Makefile.nt b/otherlibs/str/Makefile.nt index 7302805a0..f80237001 100644 --- a/otherlibs/str/Makefile.nt +++ b/otherlibs/str/Makefile.nt @@ -37,7 +37,7 @@ libstr.lib: $(COBJS:.obj=.sobj) $(MKLIB)libstr.lib $(COBJS:.obj=.sobj) str.cma: str.cmo - $(CAMLC) -a -o str.cma str.cmo -cclib -lstr + $(CAMLC) -a -o str.cma str.cmo -dllib -lstr -cclib -lstr str.cmxa: str.cmx $(CAMLOPT) -a -o str.cmxa str.cmx -cclib -lstr diff --git a/otherlibs/systhreads/Makefile.nt b/otherlibs/systhreads/Makefile.nt index a887d184e..630d586f3 100644 --- a/otherlibs/systhreads/Makefile.nt +++ b/otherlibs/systhreads/Makefile.nt @@ -52,7 +52,8 @@ win32_n.obj: win32.c mv win32.obj win32_n.obj threads.cma: $(THREAD_OBJS) - $(CAMLC) -a -o threads.cma $(THREAD_OBJS) -cclib -lthreads + $(CAMLC) -a -o threads.cma $(THREAD_OBJS) \ + -dllib -lthreads -cclib -lthreads threads.cmxa: $(THREAD_OBJS:.cmo=.cmx) $(CAMLOPT) -a -o threads.cmxa $(THREAD_OBJS:.cmo=.cmx) \ diff --git a/otherlibs/win32unix/Makefile.nt b/otherlibs/win32unix/Makefile.nt index 26e119996..80dcd2fb9 100644 --- a/otherlibs/win32unix/Makefile.nt +++ b/otherlibs/win32unix/Makefile.nt @@ -66,7 +66,7 @@ io.h: "$(SYSTEM_INCLUDES)\io.h" unix.cma: $(CAML_OBJS) $(CAMLC) -a -linkall -o unix.cma $(CAML_OBJS) \ - -cclib -lunix + -dllib -lunix -cclib -lunix wsock32.lib unix.cmxa: $(CAMLOPT_OBJS) $(CAMLOPT) -a -linkall -o unix.cmxa $(CAMLOPT_OBJS) \ @@ -91,6 +91,9 @@ installopt: unixLabels.cmo: unixLabels.ml $(CAMLC) -c $(COMPFLAGS) -nolabels unixLabels.ml +unixLabels.cmx: unixLabels.ml + $(CAMLOPT) -c $(COMPFLAGS) -nolabels unixLabels.ml + .SUFFIXES: .ml .mli .cmo .cmi .cmx .dobj .sobj .mli.cmi: |