X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=a3a65fd7ecc27b4e3477a420de916e6554a261dc;hp=5a3146af6f15a8037ddccd076ef006517f753356;hb=dabdb5d3bde5d81b197dc457ad0be95450cbf9b5;hpb=c8d51914ef24f01f935d2853d57f05d0b0a0af9e diff --git a/src/Makefile.am b/src/Makefile.am index 5a3146a..a3a65fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,10 +9,15 @@ AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"' +V_LFLAGS = $(v_lflags_@AM_V@) +v_lflags_ = $(v_lflags_@AM_DEFAULT_V@) +v_lflags_1 = -v + +AM_LFLAGS = $(V_LFLAGS) AM_YFLAGS = -d BUILT_SOURCES = include/client/sysdb.h include/sysdb.h \ - frontend/grammar.h parser/grammar.h + parser/grammar.h EXTRA_DIST = include/client/sysdb.h.in include/sysdb.h.in pkginclude_HEADERS = include/sysdb.h @@ -27,7 +32,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 @@ -41,6 +45,7 @@ pkgutilsinclude_HEADERS = \ include/utils/proto.h \ include/utils/ssl.h \ include/utils/strbuf.h \ + include/utils/strings.h \ include/utils/unixsock.h pkgclientincludedir = $(pkgincludedir)/client @@ -58,7 +63,8 @@ libsysdbclient_la_SOURCES = \ utils/error.c include/utils/error.h \ utils/proto.c include/utils/proto.h \ utils/ssl.c include/utils/ssl.h \ - utils/strbuf.c include/utils/strbuf.h + utils/strbuf.c include/utils/strbuf.h \ + utils/strings.c include/utils/strings.h libsysdbclient_la_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@ libsysdbclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) libsysdbclient_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 \ @@ -68,30 +74,29 @@ 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 \ @@ -102,6 +107,7 @@ libsysdb_la_SOURCES = \ utils/proto.c include/utils/proto.h \ utils/ssl.c include/utils/ssl.h \ utils/strbuf.c include/utils/strbuf.h \ + utils/strings.c include/utils/strings.h \ utils/unixsock.c include/utils/unixsock.h libsysdb_la_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@ libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) @@ -129,12 +135,14 @@ libsysdb_scanner_la_CFLAGS = @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@ \ sysdb_SOURCES = tools/sysdb/main.c include/client/sysdb.h \ tools/sysdb/command.c tools/sysdb/command.h \ tools/sysdb/input.c tools/sysdb/input.h \ + tools/sysdb/json.c tools/sysdb/json.h \ core/object.c include/core/object.h \ utils/llist.c include/utils/llist.h \ utils/os.c include/utils/os.h sysdb_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" \ - $(AM_CFLAGS) @READLINE_CFLAGS@ -sysdb_LDADD = libsysdb_scanner.la libsysdbclient.la @READLINE_LIBS@ -lm + $(AM_CFLAGS) @READLINE_CFLAGS@ @YAJL_CFLAGS@ +sysdb_LDADD = libsysdb_scanner.la libsysdbclient.la \ + @READLINE_LIBS@ @YAJL_LIBS@ -lm endif sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \ @@ -227,6 +235,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 @@ -236,8 +252,8 @@ sysdbd_DEPENDENCIES += plugins/store/network.la endif include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version - mkdir -p include/client - source $(abs_top_builddir)/version; sed \ + @mkdir -p include/client + $(AM_V_GEN)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" \ @@ -247,8 +263,8 @@ include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version > include/client/sysdb.h include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version - mkdir -p include - source $(abs_top_builddir)/version; sed \ + @mkdir -p include + $(AM_V_GEN)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" \ @@ -258,4 +274,4 @@ include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version > include/sysdb.h $(abs_top_builddir)/version: - cd .. && make version + $(AM_V_GEN)cd .. && make version