X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=f3bcae192846276a26dfbd868ba946868d5cbc19;hp=4c920ec0bfed4d2f94d8905b9009a46822a2641b;hb=ed2c9fc3e4ca6840a5a31c735f0cfc02fd21d4fc;hpb=89bd546c02d39662dedcc4845b5440d9c1442b6d

diff --git a/src/Makefile.am b/src/Makefile.am
index 4c920ec..f3bcae1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = liboconfig
 AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@
 AM_CXXFLAGS = @STRICT_CXXFLAGS@ @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@
 AM_LDFLAGS = @COVERAGE_LDFLAGS@ @PROFILING_LDFLAGS@
-AM_CPPFLAGS  = -I"${top_srcdir}/src/include"
+AM_CPPFLAGS  = -I${top_builddir}/src/include -I${top_srcdir}/src/include
 AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"'
 AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
 AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
@@ -12,7 +12,7 @@ AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
 AM_YFLAGS = -d
 
 BUILT_SOURCES = include/client/sysdb.h include/sysdb.h \
-		frontend/grammar.h
+		parser/grammar.h
 EXTRA_DIST = include/client/sysdb.h.in include/sysdb.h.in
 
 pkginclude_HEADERS = include/sysdb.h
@@ -27,7 +27,6 @@ pkgcoreinclude_HEADERS = \
 pkgfeincludedir = $(pkgincludedir)/frontend
 pkgfeinclude_HEADERS = \
 		include/frontend/connection.h \
-		include/frontend/parser.h \
 		include/frontend/proto.h \
 		include/frontend/sock.h
 pkgutilsincludedir = $(pkgincludedir)/utils
@@ -68,7 +67,7 @@ libsysdbclient_la_LIBADD = $(LIBLTDL) @OPENSSL_LIBS@
 # don't use strict CFLAGS for flex code
 noinst_LTLIBRARIES += libsysdb_fe_parser.la
 libsysdb_fe_parser_la_SOURCES = \
-		frontend/grammar.y frontend/scanner.l
+		parser/grammar.y parser/scanner.l
 libsysdb_fe_parser_la_CFLAGS = @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@ \
 		-DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
 libsysdb_la_SOURCES = \
@@ -77,20 +76,22 @@ libsysdb_la_SOURCES = \
 		core/plugin.c include/core/plugin.h \
 		core/store.c include/core/store.h \
 		core/store-private.h \
+		core/store_exec.c \
 		core/store_expr.c \
 		core/store_json.c \
 		core/store_lookup.c \
+		core/store_query.c \
 		core/data.c include/core/data.h \
 		core/time.c include/core/time.h \
 		core/timeseries.c include/core/timeseries.h \
-		frontend/analyzer.c \
 		frontend/connection.c include/frontend/connection.h \
 		frontend/connection-private.h \
-		frontend/parser.c include/frontend/parser.h \
 		frontend/sock.c include/frontend/sock.h \
 		frontend/session.c \
-		frontend/store.c \
 		frontend/query.c \
+		parser/analyzer.c \
+		parser/ast.c include/parser/ast.h \
+		parser/parser.c include/parser/parser.h \
 		utils/avltree.c include/utils/avltree.h \
 		utils/channel.c include/utils/channel.h \
 		utils/error.c include/utils/error.h \
@@ -224,6 +225,14 @@ sysdbd_LDADD += -dlopen plugins/timeseries/rrdtool.la
 sysdbd_DEPENDENCIES += plugins/timeseries/rrdtool.la
 endif
 
+if BUILD_PLUGIN_STOREMEMORY
+pkgstorelib_LTLIBRARIES += plugins/store/memory.la
+plugins_store_memory_la_SOURCES = plugins/store/memory.c
+plugins_store_memory_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
+sysdbd_LDADD += -dlopen plugins/store/memory.la
+sysdbd_DEPENDENCIES += plugins/store/memory.la
+endif
+
 if BUILD_PLUGIN_STORENETWORK
 pkgstorelib_LTLIBRARIES += plugins/store/network.la
 plugins_store_network_la_SOURCES = plugins/store/network.c
@@ -232,23 +241,27 @@ sysdbd_LDADD += -dlopen plugins/store/network.la
 sysdbd_DEPENDENCIES += plugins/store/network.la
 endif
 
-include/client/sysdb.h: include/client/sysdb.h.in ../version
-	source ../version; sed \
+include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version
+	mkdir -p include/client
+	source $(abs_top_builddir)/version; sed \
 	    -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
 	    -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
 	    -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
 	    -e "s/@SDB_VERSION_EXTRA@/$$VERSION_EXTRA/g" \
 	    -e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \
-	    include/client/sysdb.h.in > include/client/sysdb.h
+	    $(srcdir)/include/client/sysdb.h.in \
+	    > include/client/sysdb.h
 
-include/sysdb.h: include/sysdb.h.in ../version
-	source ../version; sed \
+include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version
+	mkdir -p include
+	source $(abs_top_builddir)/version; sed \
 	    -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
 	    -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
 	    -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
 	    -e "s/@SDB_VERSION_EXTRA@/$$VERSION_EXTRA/g" \
 	    -e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \
-	    include/sysdb.h.in > include/sysdb.h
+	    $(srcdir)/include/sysdb.h.in \
+	    > include/sysdb.h
 
-../version:
+$(abs_top_builddir)/version:
 	cd .. && make version