Changeset: e378f543a881 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e378f543a881
Modified Files:
monetdb5/extras/jaql/Makefile.ag
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaql.l
monetdb5/extras/jaql/jaql.y
monetdb5/extras/jaql/parser/force-jaql-yy-h-gen.c
monetdb5/extras/jaql/parser/jaql.l
monetdb5/extras/jaql/parser/jaql.y
Branch: jacqueline
Log Message:
buildsys: move bison and flex sources to separate dir
Since we like to compile everything with strict flags that bison and
flex generated code don't cope with (unused arguments, defined but not
used variables), move those into a separate dir, such that we can build
the rest with our strict settings.
diffs (81 lines):
diff --git a/monetdb5/extras/jaql/Makefile.ag b/monetdb5/extras/jaql/Makefile.ag
--- a/monetdb5/extras/jaql/Makefile.ag
+++ b/monetdb5/extras/jaql/Makefile.ag
@@ -15,18 +15,16 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
+MTSAFE
+
+SUBDIRS = parser
+
INCLUDES = ../../mal \
../../optimizer \
../../../common/options \
../../../common/stream \
../../../gdk
-AM_YFLAGS = -d
-AM_LFLAGS = -o$(LEX_OUTPUT_ROOT).c --header-file=$(LEX_OUTPUT_ROOT).h
-
-# flex' output isn't up to the strictness of our flags
-X_CFLAGS = #$(X_CFLAGS:-Werror=) <- recursive
-
lib__json = {
MODULE
DIR = libdir/monetdb5
@@ -38,9 +36,10 @@ lib__json = {
lib__jaql = {
MODULE
DIR = libdir/monetdb5
- SOURCES = jaql.y jaql.l jaql.c jaql.h jaqlgencode.c jaqlgencode.h
+ SOURCES = jaql.c jaql.h jaqlgencode.c jaqlgencode.h
- LIBS = ../../tools/libmonetdb5
+ # the ./ is necessary for autogen not to generate garbage
+ LIBS = ./parser/libjaqlp ../../tools/libmonetdb5
}
headers_json_mal = {
@@ -56,9 +55,9 @@ headers_jaql_mal = {
}
headers_autoload = {
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 30_jaql.mal
+ HEADERS = mal
+ DIR = libdir/monetdb5/autoload
+ SOURCES = 30_jaql.mal
}
EXTRA_DIST = json.mal jaql.mal 30_jaql.mal
diff --git a/monetdb5/extras/jaql/jaql.c b/monetdb5/extras/jaql/jaql.c
--- a/monetdb5/extras/jaql/jaql.c
+++ b/monetdb5/extras/jaql/jaql.c
@@ -31,8 +31,8 @@
#include "mal_exception.h"
#include "stream.h"
-#include "jaql.tab.h"
-#include "jaql.yy.h"
+#include "parser/jaql.tab.h"
+#include "parser/jaql.yy.h"
extern int yyparse(jc *j);
void freetree(tree *j);
diff --git a/monetdb5/extras/jaql/parser/force-jaql-yy-h-gen.c
b/monetdb5/extras/jaql/parser/force-jaql-yy-h-gen.c
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/parser/force-jaql-yy-h-gen.c
@@ -0,0 +1,4 @@
+#include "monetdb_config.h"
+#include "jaql.h"
+#include "jaql.tab.h"
+#include "jaql.yy.h" /* just to force generation for the parent level */
diff --git a/monetdb5/extras/jaql/jaql.l b/monetdb5/extras/jaql/parser/jaql.l
rename from monetdb5/extras/jaql/jaql.l
rename to monetdb5/extras/jaql/parser/jaql.l
diff --git a/monetdb5/extras/jaql/jaql.y b/monetdb5/extras/jaql/parser/jaql.y
rename from monetdb5/extras/jaql/jaql.y
rename to monetdb5/extras/jaql/parser/jaql.y
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
