nitcc: move sources to a src/ subdirectory

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/contrib/nitcc/Makefile b/contrib/nitcc/Makefile
index b9b9986..62f951e 100644 (file)
--- a/contrib/nitcc/Makefile
+++ b/contrib/nitcc/Makefile
@@ -1,39 +1,8 @@
-NITC=../../bin/nitg
+all:
+%: FORCE
+       ${MAKE} $@ ${MFLAGS} -C src/
 
-all: nitcc calc
+Makefile:
+       true
 
-nitcc_parser_gen: nitcc_parser_gen.nit
-       @echo "*** Compile the nitcc bootstrap parser generator -- level 0"
-       ${NITC} nitcc_parser_gen.nit -v
-
-nitcc0: nitcc.nit nitcc_parser_gen
-       @echo "*** Compile the primitive nitcc --- bootstrap level 0"
-       ./nitcc_parser_gen
-       ${NITC} nitcc.nit -v -o nitcc0
-
-nitcc1: nitcc0 nitcc.nit
-       @echo "*** Compile the intermediate nitcc --- bootstrap level 1"
-       ./nitcc0 nitcc.sablecc
-       ${NITC} nitcc.nit -v -o nitcc1
-
-nitcc: nitcc1 nitcc.nit
-       @echo "*** Compile the final nitcc --- bootstrap level 2"
-       ./nitcc1 nitcc.sablecc
-       ${NITC} nitcc.nit -v
-
-calc: nitcc examples/calc.sablecc examples/calc.nit
-       @echo "*** Example program, calc"
-       cd examples && ../nitcc calc.sablecc
-       ${NITC} examples/calc.nit -v
-       ./calc -e "1+2*3-40/5+9------1"
-
-minilang: nitcc examples/minilang.sablecc examples/minilang.nit
-       @echo "*** Example program, minilang"
-       cd examples && ../nitcc minilang.sablecc
-       ${NITC} examples/minilang.nit -v
-       printf "10\n42\n" | ./minilang examples/minilang.minilang
-
-tests:
-       cd tests && ./run
-
-.PHONY: tests
+.PHONY: FORCE

diff --git a/contrib/nitcc/src/Makefile b/contrib/nitcc/src/Makefile
new file mode 100644 (file)
index 0000000..f17cc5f
--- /dev/null
+++ b/contrib/nitcc/src/Makefile
@@ -0,0 +1,39 @@
+NITC=../../../bin/nitg
+
+all: nitcc calc
+
+nitcc_parser_gen: nitcc_parser_gen.nit
+       @echo "*** Compile the nitcc bootstrap parser generator -- level 0"
+       ${NITC} nitcc_parser_gen.nit -v
+
+nitcc0: nitcc.nit nitcc_parser_gen
+       @echo "*** Compile the primitive nitcc --- bootstrap level 0"
+       ./nitcc_parser_gen
+       ${NITC} nitcc.nit -v -o nitcc0
+
+nitcc1: nitcc0 nitcc.nit
+       @echo "*** Compile the intermediate nitcc --- bootstrap level 1"
+       ./nitcc0 nitcc.sablecc
+       ${NITC} nitcc.nit -v -o nitcc1
+
+nitcc: nitcc1 nitcc.nit
+       @echo "*** Compile the final nitcc --- bootstrap level 2"
+       ./nitcc1 nitcc.sablecc
+       ${NITC} nitcc.nit -v
+
+calc: nitcc ../examples/calc.sablecc ../examples/calc.nit
+       @echo "*** Example program, calc"
+       cd ../examples && ../src/nitcc calc.sablecc
+       ${NITC} ../examples/calc.nit -v
+       ./calc -e "1+2*3-40/5+9------1"
+
+minilang: nitcc ../examples/minilang.sablecc ../examples/minilang.nit
+       @echo "*** Example program, minilang"
+       cd ../examples && ../src/nitcc minilang.sablecc
+       ${NITC} ../examples/minilang.nit -v
+       printf "10\n42\n" | ./minilang ../examples/minilang.minilang
+
+tests:
+       cd ../tests && ./run
+
+.PHONY: tests

diff --git a/contrib/nitcc/autom.nit b/contrib/nitcc/src/autom.nit
similarity index 100%
rename from contrib/nitcc/autom.nit
rename to contrib/nitcc/src/autom.nit

diff --git a/contrib/nitcc/grammar.nit b/contrib/nitcc/src/grammar.nit
similarity index 100%
rename from contrib/nitcc/grammar.nit
rename to contrib/nitcc/src/grammar.nit

diff --git a/contrib/nitcc/nitcc.nit b/contrib/nitcc/src/nitcc.nit
similarity index 100%
rename from contrib/nitcc/nitcc.nit
rename to contrib/nitcc/src/nitcc.nit

diff --git a/contrib/nitcc/nitcc.sablecc b/contrib/nitcc/src/nitcc.sablecc
similarity index 100%
rename from contrib/nitcc/nitcc.sablecc
rename to contrib/nitcc/src/nitcc.sablecc

diff --git a/contrib/nitcc/nitcc_lexer0.nit b/contrib/nitcc/src/nitcc_lexer0.nit
similarity index 100%
rename from contrib/nitcc/nitcc_lexer0.nit
rename to contrib/nitcc/src/nitcc_lexer0.nit

diff --git a/contrib/nitcc/nitcc_parser_gen.nit b/contrib/nitcc/src/nitcc_parser_gen.nit
similarity index 100%
rename from contrib/nitcc/nitcc_parser_gen.nit
rename to contrib/nitcc/src/nitcc_parser_gen.nit

diff --git a/contrib/nitcc/nitcc_semantic.nit b/contrib/nitcc/src/nitcc_semantic.nit
similarity index 100%
rename from contrib/nitcc/nitcc_semantic.nit
rename to contrib/nitcc/src/nitcc_semantic.nit

diff --git a/contrib/nitcc/re2nfa.nit b/contrib/nitcc/src/re2nfa.nit
similarity index 100%
rename from contrib/nitcc/re2nfa.nit
rename to contrib/nitcc/src/re2nfa.nit

diff --git a/contrib/nitcc/tests/t b/contrib/nitcc/tests/t
index 316db3f..c2233ef 100755 (executable)
--- a/contrib/nitcc/tests/t
+++ b/contrib/nitcc/tests/t
@@ -18,7 +18,7 @@
 
 # This program is used to perform regression tests of nitcc.
 
-NITCC=../nitcc
+NITCC=../src/nitcc
 NITC=../../../bin/nitc
 
 mkdir alt out 2>/dev/null