diff --git a/src/Makefile.am b/src/Makefile.am
index f3bcae192846276a26dfbd868ba946868d5cbc19..a3a65fd7ecc27b4e3477a420de916e6554a261dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
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 \
AM_YFLAGS = -d
BUILT_SOURCES = include/client/sysdb.h include/sysdb.h \
include/utils/proto.h \
include/utils/ssl.h \
include/utils/strbuf.h \
include/utils/proto.h \
include/utils/ssl.h \
include/utils/strbuf.h \
+ include/utils/strings.h \
include/utils/unixsock.h
pkgclientincludedir = $(pkgincludedir)/client
include/utils/unixsock.h
pkgclientincludedir = $(pkgincludedir)/client
utils/error.c include/utils/error.h \
utils/proto.c include/utils/proto.h \
utils/ssl.c include/utils/ssl.h \
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 \
libsysdbclient_la_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@
libsysdbclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
libsysdbclient_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 \
-DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
libsysdb_la_SOURCES = \
sysdb.c include/sysdb.h \
-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/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_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/store_json.c include/core/store.h \
core/time.c include/core/time.h \
core/timeseries.c include/core/timeseries.h \
frontend/connection.c include/frontend/connection.h \
core/time.c include/core/time.h \
core/timeseries.c include/core/timeseries.h \
frontend/connection.c include/frontend/connection.h \
utils/proto.c include/utils/proto.h \
utils/ssl.c include/utils/ssl.h \
utils/strbuf.c include/utils/strbuf.h \
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)
utils/unixsock.c include/utils/unixsock.h
libsysdb_la_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@
libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
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 \
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)\"" \
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 \
endif
sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \
endif
include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version
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" \
-e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
-e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
-e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
> include/client/sysdb.h
include/sysdb.h: include/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" \
-e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
-e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
-e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
> include/sysdb.h
$(abs_top_builddir)/version:
> include/sysdb.h
$(abs_top_builddir)/version:
- cd .. && make version
+ $(AM_V_GEN)cd .. && make version