moved grammars out to their own dirs

We also want some testing/validation support for each grammar. This dir will
get quite messy if we move files.

13 files changed, 40 insertions, 23 deletions

diff --git a/grammar/.gitignore b/grammar/.gitignore
deleted file mode 100644
index acbf5ac9..00000000
--- a/grammar/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/rust.c
-/rust
-/pcre.c
-/pcre
-/pcre-colm.c
-/pcre-colm
-/dns.cc
-/dns
diff --git a/grammar/Makefile b/grammar/Makefile
index 35f244f5..21a2603a 100644
--- a/grammar/Makefile
+++ b/grammar/Makefile
@@ -1,18 +1,6 @@
-all: rust pcre pcre-colm dns
+SUBDIRS = "rust pcre dns"
 
-RAGEL = ../ragel/ragel
-COLM = ../colm/colm
+all: rust pcre dns
+	for d in $(SUBDIRS); do cd $$d && $(MAKE); done
 
-rust: rust.lm parserust.lm $(COLM)
-	$(COLM) -o rust parserust.lm
 
-pcre: pcre.rl $(RAGEL)
-	$(RAGEL) -G2 pcre.rl
-	gcc -g -Wall -o pcre pcre.c
-
-pcre-colm: pcre.lm
-	$(COLM) -o pcre-colm pcre.lm
-
-dns: dns.rl
-	$(RAGEL) -G2 -o dns.cc dns.rl
-	g++ -g -Wall -o dns dns.cc -lpcap
diff --git a/grammar/dns/.gitignore b/grammar/dns/.gitignore
new file mode 100644
index 00000000..f2c6cd5b
--- /dev/null
+++ b/grammar/dns/.gitignore
@@ -0,0 +1,2 @@
+/dns.cc
+/dns
diff --git a/grammar/dns/Makefile b/grammar/dns/Makefile
new file mode 100644
index 00000000..b1a87107
--- /dev/null
+++ b/grammar/dns/Makefile
@@ -0,0 +1,9 @@
+COLM = ../../colm/colm
+RAGEL = ../../ragel/ragel
+
+all: dns
+
+dns: dns.rl
+	$(RAGEL) -G2 -o dns.cc dns.rl
+	g++ -g -Wall -o dns dns.cc -lpcap
+
diff --git a/grammar/dns.rl b/grammar/dns/dns.rl
index 215c61bd..215c61bd 100644
--- a/grammar/dns.rl
+++ b/grammar/dns/dns.rl
diff --git a/grammar/pcre/.gitignore b/grammar/pcre/.gitignore
new file mode 100644
index 00000000..05b136b8
--- /dev/null
+++ b/grammar/pcre/.gitignore
@@ -0,0 +1,4 @@
+/pcre-colm.c
+/pcre-colm
+/pcre-ragel.c
+/pcre-ragel
diff --git a/grammar/pcre/Makefile b/grammar/pcre/Makefile
new file mode 100644
index 00000000..6f895485
--- /dev/null
+++ b/grammar/pcre/Makefile
@@ -0,0 +1,11 @@
+COLM = ../../colm/colm
+RAGEL = ../../ragel/ragel
+
+all: pcre-colm pcre-ragel
+
+pcre-colm: pcre.lm
+	$(COLM) -o $@ pcre.lm
+
+pcre-ragel: pcre.rl $(RAGEL)
+	$(RAGEL) -G2 pcre.rl
+	gcc -g -Wall -o $@ pcre.c
diff --git a/grammar/pcre.lm b/grammar/pcre/pcre.lm
index 691b1307..691b1307 100644
--- a/grammar/pcre.lm
+++ b/grammar/pcre/pcre.lm
diff --git a/grammar/pcre.rl b/grammar/pcre/pcre.rl
index 307d5467..307d5467 100644
--- a/grammar/pcre.rl
+++ b/grammar/pcre/pcre.rl
diff --git a/grammar/rust/.gitignore b/grammar/rust/.gitignore
new file mode 100644
index 00000000..5bf8231b
--- /dev/null
+++ b/grammar/rust/.gitignore
@@ -0,0 +1,4 @@
+/rust.c
+/rust
+/query.c
+/query
diff --git a/grammar/rust/Makefile b/grammar/rust/Makefile
new file mode 100644
index 00000000..20e3edeb
--- /dev/null
+++ b/grammar/rust/Makefile
@@ -0,0 +1,7 @@
+COLM = ../../colm/colm
+RAGEL = ../../ragel/ragel
+
+all: rust
+
+rust: rust.lm parserust.lm $(COLM)
+	$(COLM) -o rust parserust.lm
diff --git a/grammar/parserust.lm b/grammar/rust/parserust.lm
index 3e17a3b6..3e17a3b6 100644
--- a/grammar/parserust.lm
+++ b/grammar/rust/parserust.lm
diff --git a/grammar/rust.lm b/grammar/rust/rust.lm
index f6dd8c15..f6dd8c15 100644
--- a/grammar/rust.lm
+++ b/grammar/rust/rust.lm