diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2007-11-22 19:01:50 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2007-11-22 19:01:50 +0000 |
| commit | 16e4a6819720ea32f4c0fcc4c8bd344b19d29a72 (patch) | |
| tree | a356f8091557d4a758776d88dcaa07b4cc225dc0 /otherlibs | |
| parent | d0f5ecfa76396b2d6fef3bd2113c9dcec279cfe3 (diff) | |
| download | ocaml-16e4a6819720ea32f4c0fcc4c8bd344b19d29a72.tar.gz | |
PR#4243 partial solution
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8615 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs')
| -rw-r--r-- | otherlibs/dynlink/Makefile | 4 | ||||
| -rw-r--r-- | otherlibs/labltk/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/labltk/camltk/Makefile.gen | 7 | ||||
| -rw-r--r-- | otherlibs/labltk/labltk/Makefile.gen | 6 |
4 files changed, 14 insertions, 5 deletions
diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile index 9092458f10..60938a21ae 100644 --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile @@ -52,9 +52,11 @@ dynlink.cma: $(OBJS) dynlink.cmxa: $(NATOBJS) $(CAMLOPT) $(COMPFLAGS) -ccopt "$(NATDYNLINKOPTS)" -a -o dynlink.cmxa $(NATOBJS) -dynlinkaux.cmo dynlinkaux.cmi: $(COMPILEROBJS) +dynlinkaux.cmo: $(COMPILEROBJS) $(CAMLC) $(COMPFLAGS) -pack -o dynlinkaux.cmo $(COMPILEROBJS) +dynlinkaux.cmi: dynlinkaux.cmo + dynlink.cmx: dynlink.cmi natdynlink.ml cp natdynlink.ml dynlink.mlopt $(CAMLOPT) -c $(COMPFLAGS) -impl dynlink.mlopt diff --git a/otherlibs/labltk/Makefile b/otherlibs/labltk/Makefile index 83ecabe745..630d7f292a 100644 --- a/otherlibs/labltk/Makefile +++ b/otherlibs/labltk/Makefile @@ -32,7 +32,7 @@ allopt: byte: all opt: allopt -.PHONY: labltk camltk examples_labltk examples_camltk +.PHONY: all allopt byte opt labltk camltk examples_labltk examples_camltk labltk: Widgets.src compiler/tkcompiler -outdir labltk diff --git a/otherlibs/labltk/camltk/Makefile.gen b/otherlibs/labltk/camltk/Makefile.gen index cbdb298086..b0ad4c462a 100644 --- a/otherlibs/labltk/camltk/Makefile.gen +++ b/otherlibs/labltk/camltk/Makefile.gen @@ -5,7 +5,9 @@ all: cTk.ml camltk.ml .depend _tkgen.ml: ../Widgets.src ../compiler/tkcompiler$(EXE) cd ..; $(CAMLRUNGEN) compiler/tkcompiler$(EXE) -camltk -outdir camltk -cTk.ml camltk.ml .depend: _tkgen.ml ../builtin/report.ml ../compiler/pp$(EXE) #../builtin/builtin_*.ml +cTk.ml camltk.ml .depend: generate + +generate: _tkgen.ml ../builtin/report.ml ../compiler/pp$(EXE) #../builtin/builtin_*.ml (echo '##define CAMLTK'; \ echo 'include Camltkwrap'; \ echo 'open Widget'; \ @@ -45,5 +47,6 @@ cTk.ml camltk.ml .depend: _tkgen.ml ../builtin/report.ml ../compiler/pp$(EXE) #. # All .{ml,mli} files are generated in this directory clean: rm -f *.cm* *.ml *.mli *.$(O) *.$(A) .depend - # rm -f modules + +.PHONY: all generate clean diff --git a/otherlibs/labltk/labltk/Makefile.gen b/otherlibs/labltk/labltk/Makefile.gen index 57edae6638..bfc482aa5c 100644 --- a/otherlibs/labltk/labltk/Makefile.gen +++ b/otherlibs/labltk/labltk/Makefile.gen @@ -7,7 +7,9 @@ _tkgen.ml: ../Widgets.src ../compiler/tkcompiler$(EXE) # dependencies are broken: wouldn't work with gmake 3.77 -tk.ml labltk.ml .depend: _tkgen.ml ../builtin/report.ml ../compiler/pp$(EXE) #../builtin/builtin_*.ml +tk.ml labltk.ml .depend: generate + +generate: _tkgen.ml ../builtin/report.ml ../compiler/pp$(EXE) #../builtin/builtin_*.ml (echo 'open StdLabels'; \ echo 'open Widget'; \ echo 'open Protocol'; \ @@ -46,3 +48,5 @@ clean: rm -f *.cm* *.ml *.mli *.$(O) *.$(A) .depend # rm -f modules + +.PHONY: all generate clean |