projects / packages / antlr.git / blame
| Commit | Line | Data |
|---|---|---|
| a905d3c2 AM |
1 | diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp |
| 2 | --- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100 | |
| 3 | +++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2008-03-19 20:09:21.000000000 +0100 | |
| 4 | @@ -10,6 +10,7 @@ | |
| 5 | ||
| 6 | #include <antlr/config.hpp> | |
| 7 | ||
| 8 | +#include <cstring> | |
| 9 | #include <map> | |
| 10 | ||
| 11 | #ifdef HAS_NOT_CCTYPE_H | |
| 12 | --- antlr/lib/cpp/antlr/CharScanner.hpp~ 2008-11-11 21:24:02.000000000 +0000 | |
| 13 | +++ anrlt/lib/cpp/antlr/CharScanner.hpp 2008-11-11 21:24:33.000000000 +0000 | |
| 14 | @@ -10,6 +10,7 @@ | |
| 15 | ||
| 16 | #include <antlr/config.hpp> | |
| 17 | ||
| 18 | +#include <cstdio> | |
| 19 | #include <cstring> | |
| 20 | #include <map> | |
| 21 | ||
| 22 | diff -Nur antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in | |
| 23 | --- antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200 | |
| 24 | +++ antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in 2009-03-30 02:09:28.000000000 +0300 | |
| 25 | @@ -143,7 +143,7 @@ | |
| 26 | @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.cpp \ | |
| 27 | @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.hpp \ | |
| 28 | : | |
| 29 | - @ @MAKE@ -C @abs_this_builddir@/examples/cpp/tinyc | |
| 30 | + @ $(MAKE) -C @abs_this_builddir@/examples/cpp/tinyc | |
| 31 | ||
| 32 | $(objdir)/.subc.g : $(srcdir)/subc.g $(objdir)/TinyCParserTokenTypes.txt @ANTLR_JAR@ | |
| 33 | @ANTLRFLAGS="-glib `@CYGPATH_W@ $(_srcdir)/../tinyc/tinyc.g` -o `@CYGPATH_W@ $(thisdir)`" @ANTLR_COMPILE_CMD@ $(srcdir)/subc.g | |
| 34 | diff -Nur antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in | |
| 35 | --- antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200 | |
| 36 | +++ antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in 2009-03-30 02:07:25.000000000 +0300 | |
| 37 | @@ -77,7 +77,7 @@ | |
| 38 | @ @CP@ $< $@ | |
| 39 | ||
| 40 | @abs_this_builddir@/examples/java/tinyc/TinyCParserTokenTypes.txt : | |
| 41 | - @ @MAKE@ -C @abs_this_builddir@/examples/java/tinyc test | |
| 42 | + @ $(MAKE) -C @abs_this_builddir@/examples/java/tinyc test | |
| 43 | ||
| 44 | ||
| 45 | ## How to generated *.java .. | |
| 46 | diff -Nur antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in | |
| 47 | --- antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in 2006-11-01 23:37:18.000000000 +0200 | |
| 48 | +++ antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in 2009-03-30 02:09:07.000000000 +0300 | |
| 49 | @@ -61,11 +61,11 @@ | |
| 50 | ## file resides. Therefore we are going to "make" the base | |
| 51 | ## grammar first and then copy required vocabulary over .. | |
| 52 | TinyCTokenTypes.txt : | |
| 53 | - @MAKE@ -C ../tinyc | |
| 54 | + $(MAKE) -C ../tinyc | |
| 55 | @CP@ ../tinyc/$@ $@ | |
| 56 | ||
| 57 | @abs_this_builddir@/examples/python/tinyc/%.py : | |
| 58 | - @MAKE@ -C ../tinyc | |
| 59 | + $(MAKE) -C ../tinyc | |
| 60 | ||
| 61 | test :: test1 | |
| 62 | ||
| 63 | diff -Nur antlr-2.7.7/Makefile.in antlr-2.7.7_patched/Makefile.in | |
| 64 | --- antlr-2.7.7/Makefile.in 2006-11-01 23:37:18.000000000 +0200 | |
| 65 | +++ antlr-2.7.7_patched/Makefile.in 2009-03-30 02:05:41.000000000 +0300 | |
| 66 | @@ -31,7 +31,7 @@ | |
| 67 | ||
| 68 | test clean distclean install :: | |
| 69 | @ if test -f examples/Makefile ; then \ | |
| 70 | - @MAKE@ -C examples $@ ; \ | |
| 71 | + $(MAKE) -C examples $@ ; \ | |
| 72 | fi | |
| 73 | ||
| 74 | # Rule to remove all objects, cores, ANTLR generated, | |
| 75 | diff -Nur antlr-2.7.7/scripts/config.make.in antlr-2.7.7_patched/scripts/config.make.in | |
| 76 | --- antlr-2.7.7/scripts/config.make.in 2006-11-01 23:37:18.000000000 +0200 | |
| 77 | +++ antlr-2.7.7_patched/scripts/config.make.in 2009-03-30 02:04:54.000000000 +0300 | |
| 78 | @@ -47,9 +47,9 @@ | |
| 79 | *) \ | |
| 80 | if test -f "$${d}/Makefile" ; then \ | |
| 81 | echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \ | |
| 82 | - echo ">> @MAKE@ -C $(subdir)/$${d} $@ " ; \ | |
| 83 | + echo ">> $(MAKE) -C $(subdir)/$${d} $@ " ; \ | |
| 84 | echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \ | |
| 85 | - @MAKE@ -C "$$d" $@ || exit 1 ;\ | |
| 86 | + $(MAKE) -C "$$d" $@ || exit 1 ;\ | |
| 87 | fi ; \ | |
| 88 | ;; \ | |
| 89 | esac ; \ |