Given the d2c compiler its own directory.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@420 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

26 files changed, 99 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 2310c44..b136567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+14-11-15  Cyrille Bagard <nocbos@gmail.com>
+
+	* configure.ac:
+	Add the new Makefile from the 'tools/d2c' directory.
+
+	* src/arch/arm/v7/opdefs/Makefile.am:
+	Update paths.
+
+	* tools/bits.c:
+	* tools/bits.h:
+	* tools/coder.c:
+	* tools/coder.h:
+	* tools/conv.c:
+	* tools/conv.h:
+	Moved entries: see the new 'd2c' directory.
+
+	* tools/d2c
+	* tools/d2c/Makefile.am
+	* tools/d2c/bits.c
+	* tools/d2c/bits.h
+	* tools/d2c/coder.c
+	* tools/d2c/coder.h
+	* tools/d2c/conv.c
+	* tools/d2c/conv.h
+	* tools/d2c/d2c.mk
+	* tools/d2c/d2c_gram.y
+	* tools/d2c/d2c_tok.l
+	* tools/d2c/helpers.c
+	* tools/d2c/helpers.h
+	* tools/d2c/macros.c
+	* tools/d2c/macros.h
+	* tools/d2c/pproc.c
+	* tools/d2c/pproc.h
+	* tools/d2c/rules.c
+	* tools/d2c/rules.h
+	* tools/d2c/spec.c
+	* tools/d2c/spec.h
+	* tools/d2c/syntax.c
+	* tools/d2c/syntax.h
+	New entries: give the d2c compiler its own directory.
+
+	* tools/d2c_gram.y:
+	* tools/d2c.mk:
+	* tools/d2c_tok.l:
+	* tools/helpers.c:
+	* tools/helpers.h:
+	* tools/macros.c:
+	* tools/macros.h:
+	Moved entries: see the new 'd2c' directory.
+
+	* tools/Makefile.am:
+	Create a SUBDIR item, with content equal to 'd2c'.
+
+	* tools/pproc.c:
+	* tools/pproc.h:
+	* tools/rules.c:
+	* tools/rules.h:
+	* tools/spec.c:
+	* tools/spec.h:
+	* tools/syntax.c:
+	* tools/syntax.h:
+	Moved entries: see the new 'd2c' directory.
+
 14-11-14  Cyrille Bagard <nocbos@gmail.com>
 
 	* src/arch/arm/v7/arm.c:
diff --git a/configure.ac b/configure.ac
index 85ab307..f60f801 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,6 +351,7 @@ AC_CONFIG_FILES([Makefile
                  src/plugins/Makefile
                  src/plugins/overjump/Makefile
                  tools/Makefile
+                 tools/d2c/Makefile
                  themes/Makefile])
 
 AC_OUTPUT
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index 9aa6a82..d576782 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -1,8 +1,8 @@
 
-include ../../../../../tools/d2c.mk
+include ../../../../../tools/d2c/d2c.mk
 
 
-D2C_BIN = ../../../../../tools/d2c
+D2C_BIN = ../../../../../tools/d2c/d2c
 
 D2C_OUTDIR = $(PWD)/..
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d0fdbe8..ed53403 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,32 +1,2 @@
 
-BUILT_SOURCES = d2c-d2c_gram.h
-
-AM_YFLAGS = -d
-
-bin_PROGRAMS = d2c
-
-
-d2c_SOURCES =							\
-	bits.h bits.c						\
-	coder.h coder.c						\
-	conv.h conv.c						\
-	d2c_tok.l							\
-	d2c_gram.y							\
-	helpers.h helpers.c					\
-	pproc.h pproc.c						\
-	rules.h rules.c						\
-	spec.h spec.c						\
-	syntax.h syntax.c
-
-d2c_YFLAGS = -v -d -p d2c_ -o y.tab.c
-
-d2c_LFLAGS = -P d2c_ --header-file=d2c_tok.h -o lex.yy.c
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS)
-
-
-# Automake fait les choses à moitié
-CLEANFILES = d2c_gram.h d2c_gram.c d2c-d2c_tok.c
+SUBDIRS = d2c
diff --git a/tools/d2c/Makefile.am b/tools/d2c/Makefile.am
new file mode 100644
index 0000000..d0fdbe8
--- /dev/null
+++ b/tools/d2c/Makefile.am
@@ -0,0 +1,32 @@
+
+BUILT_SOURCES = d2c-d2c_gram.h
+
+AM_YFLAGS = -d
+
+bin_PROGRAMS = d2c
+
+
+d2c_SOURCES =							\
+	bits.h bits.c						\
+	coder.h coder.c						\
+	conv.h conv.c						\
+	d2c_tok.l							\
+	d2c_gram.y							\
+	helpers.h helpers.c					\
+	pproc.h pproc.c						\
+	rules.h rules.c						\
+	spec.h spec.c						\
+	syntax.h syntax.c
+
+d2c_YFLAGS = -v -d -p d2c_ -o y.tab.c
+
+d2c_LFLAGS = -P d2c_ --header-file=d2c_tok.h -o lex.yy.c
+
+
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
+
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS)
+
+
+# Automake fait les choses à moitié
+CLEANFILES = d2c_gram.h d2c_gram.c d2c-d2c_tok.c
diff --git a/tools/bits.c b/tools/d2c/bits.c
index 32c3fd9..32c3fd9 100644
--- a/tools/bits.c
+++ b/tools/d2c/bits.c
diff --git a/tools/bits.h b/tools/d2c/bits.h
index aa4b7aa..aa4b7aa 100644
--- a/tools/bits.h
+++ b/tools/d2c/bits.h
diff --git a/tools/coder.c b/tools/d2c/coder.c
index 5856d80..5856d80 100644
--- a/tools/coder.c
+++ b/tools/d2c/coder.c
diff --git a/tools/coder.h b/tools/d2c/coder.h
index e72764c..e72764c 100644
--- a/tools/coder.h
+++ b/tools/d2c/coder.h
diff --git a/tools/conv.c b/tools/d2c/conv.c
index 323f63d..323f63d 100644
--- a/tools/conv.c
+++ b/tools/d2c/conv.c
diff --git a/tools/conv.h b/tools/d2c/conv.h
index acf007b..acf007b 100644
--- a/tools/conv.h
+++ b/tools/d2c/conv.h
diff --git a/tools/d2c.mk b/tools/d2c/d2c.mk
index 25596cf..25596cf 100644
--- a/tools/d2c.mk
+++ b/tools/d2c/d2c.mk
diff --git a/tools/d2c_gram.y b/tools/d2c/d2c_gram.y
index 5deb053..5deb053 100644
--- a/tools/d2c_gram.y
+++ b/tools/d2c/d2c_gram.y
diff --git a/tools/d2c_tok.l b/tools/d2c/d2c_tok.l
index 50a8d8f..50a8d8f 100644
--- a/tools/d2c_tok.l
+++ b/tools/d2c/d2c_tok.l
diff --git a/tools/helpers.c b/tools/d2c/helpers.c
index 1353ba2..1353ba2 100644
--- a/tools/helpers.c
+++ b/tools/d2c/helpers.c
diff --git a/tools/helpers.h b/tools/d2c/helpers.h
index 8c39a85..8c39a85 100644
--- a/tools/helpers.h
+++ b/tools/d2c/helpers.h
diff --git a/tools/macros.c b/tools/d2c/macros.c
index b1c44f0..b1c44f0 100644
--- a/tools/macros.c
+++ b/tools/d2c/macros.c
diff --git a/tools/macros.h b/tools/d2c/macros.h
index 3755f00..3755f00 100644
--- a/tools/macros.h
+++ b/tools/d2c/macros.h
diff --git a/tools/pproc.c b/tools/d2c/pproc.c
index 8644af5..8644af5 100644
--- a/tools/pproc.c
+++ b/tools/d2c/pproc.c
diff --git a/tools/pproc.h b/tools/d2c/pproc.h
index 6675fa1..6675fa1 100644
--- a/tools/pproc.h
+++ b/tools/d2c/pproc.h
diff --git a/tools/rules.c b/tools/d2c/rules.c
index 25ba76c..25ba76c 100644
--- a/tools/rules.c
+++ b/tools/d2c/rules.c
diff --git a/tools/rules.h b/tools/d2c/rules.h
index a4a9bb4..a4a9bb4 100644
--- a/tools/rules.h
+++ b/tools/d2c/rules.h
diff --git a/tools/spec.c b/tools/d2c/spec.c
index a957587..a957587 100644
--- a/tools/spec.c
+++ b/tools/d2c/spec.c
diff --git a/tools/spec.h b/tools/d2c/spec.h
index 46d922b..46d922b 100644
--- a/tools/spec.h
+++ b/tools/d2c/spec.h
diff --git a/tools/syntax.c b/tools/d2c/syntax.c
index 5fec1a6..5fec1a6 100644
--- a/tools/syntax.c
+++ b/tools/d2c/syntax.c
diff --git a/tools/syntax.h b/tools/d2c/syntax.h
index 0cd9210..0cd9210 100644
--- a/tools/syntax.h
+++ b/tools/d2c/syntax.h