diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2009-05-10 10:13:41 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2009-05-10 10:13:41 -0400 |
| commit | dd6e7d3895ffed07869aa8ec6a51abaf9c602ca9 (patch) | |
| tree | 4d6c5d2e31d42a758392a29bb37c4c7f29a3d8c2 | |
| parent | 826967960e5a71bd65c384b50b07ad0b9f76e4fb (diff) | |
Use Ur/Web library .mlb
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | src/compiler.mlb | 5 | ||||
| -rw-r--r-- | src/prefix.cm | 1 | ||||
| -rw-r--r-- | src/prefix.mlb | 10 | ||||
| -rw-r--r-- | src/suffix.mlb | 3 |
5 files changed, 17 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 82ec86c1..4f50ec81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,7 +35,7 @@ src/urweb.mlb: src/prefix.mlb src/sources src/suffix.mlb cat src/prefix.mlb src/sources src/suffix.mlb \ | sed 's/^\(.*\).grm$$/\1.mlton.grm.sig:\1.mlton.grm.sml/; y/:/\n/' \ | sed 's/^\(.*\).lex$$/\1.mlton.lex.sml/' \ - >src/urweb.mlb + >$@ %.mlton.lex: %.lex cp $< $@ @@ -58,10 +58,10 @@ ifdef PROFILE MLTON += -profile $(PROFILE) endif -bin/urweb: src/urweb.mlb src/*.sig src/*.sml \ +bin/urweb: src/compiler.mlb src/urweb.mlb src/*.sig src/*.sml \ src/urweb.mlton.lex.sml \ src/urweb.mlton.grm.sig src/urweb.mlton.grm.sml - $(MLTON) -output $@ src/urweb.mlb + $(MLTON) -output $@ src/compiler.mlb install: mkdir -p $(BIN) diff --git a/src/compiler.mlb b/src/compiler.mlb new file mode 100644 index 00000000..83212484 --- /dev/null +++ b/src/compiler.mlb @@ -0,0 +1,5 @@ +$(SML_LIB)/basis/basis.mlb + +urweb.mlb + +main.mlton.sml diff --git a/src/prefix.cm b/src/prefix.cm index e4be65c4..2e71d073 100644 --- a/src/prefix.cm +++ b/src/prefix.cm @@ -4,3 +4,4 @@ $/basis.cm $/smlnj-lib.cm $smlnj/ml-yacc/ml-yacc-lib.cm $/pp-lib.cm + diff --git a/src/prefix.mlb b/src/prefix.mlb index 7e47a195..6a510481 100644 --- a/src/prefix.mlb +++ b/src/prefix.mlb @@ -1,5 +1,7 @@ -$(SML_LIB)/basis/basis.mlb -$(SML_LIB)/smlnj-lib/Util/smlnj-lib.mlb -$(SML_LIB)/mlyacc-lib/mlyacc-lib.mlb -$(SML_LIB)/smlnj-lib/PP/pp-lib.mlb +local + $(SML_LIB)/basis/basis.mlb + $(SML_LIB)/smlnj-lib/Util/smlnj-lib.mlb + $(SML_LIB)/mlyacc-lib/mlyacc-lib.mlb + $(SML_LIB)/smlnj-lib/PP/pp-lib.mlb +in diff --git a/src/suffix.mlb b/src/suffix.mlb index e50b4f49..7f2d0650 100644 --- a/src/suffix.mlb +++ b/src/suffix.mlb @@ -1 +1,2 @@ -main.mlton.sml + +end |