X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=a3a65fd7ecc27b4e3477a420de916e6554a261dc;hb=f3b0a31699113fd9f4bf505929bd22a924153c50;hp=f3bcae192846276a26dfbd868ba946868d5cbc19;hpb=dc7d88e992d19870cbec25244e0f1d4ddc0541b7;p=sysdb.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f3bcae1..a3a65fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,11 @@ 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 \
@@ -40,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
@@ -57,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 \
@@ -72,16 +79,16 @@ 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_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 \
@@ -100,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)
@@ -127,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 \
@@ -242,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" \
@@ -253,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" \
@@ -264,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