X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=886cc1ad2d80d562db0bba0fe71d141bb9518c9a;hp=a7f6c9b73744c4f27dade47960386a7bea35a110;hb=98439daa576d4dbc533e9d4b8a5f493926389554;hpb=c1ebabaddb0c56ee34843f358c12d4a2536796f8

diff --git a/src/Makefile.am b/src/Makefile.am
index a7f6c9b..886cc1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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,30 +67,31 @@ 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 = \
 		sysdb.c include/sysdb.h \
+		core/data.c include/core/data.h \
+		core/memstore.c include/core/memstore.h \
+		core/memstore-private.h \
+		core/memstore_exec.c \
+		core/memstore_expr.c \
+		core/memstore_lookup.c \
+		core/memstore_query.c \
 		core/object.c include/core/object.h \
 		core/plugin.c include/core/plugin.h \
-		core/store.c include/core/store.h \
-		core/store-private.h \
-		core/store_expr.c \
-		core/store_json.c \
-		core/store_lookup.c \
-		core/data.c include/core/data.h \
+		core/store_json.c include/core/store.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 \
@@ -225,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