diff --git a/src/Makefile.am b/src/Makefile.am
index 948d1fa17e19a73fd787c2ea5068bf1f77ddb9b2..fea709ecbdf43d4565a1c4b0c8daef2502d85eed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
-BUILT_SOURCES = include/sysdb.h
+BUILT_SOURCES = include/client/sysdb.h include/sysdb.h
pkginclude_HEADERS = include/sysdb.h
pkgcoreincludedir = $(pkgincludedir)/core
pkgcoreinclude_HEADERS = \
+ include/core/data.h \
include/core/object.h \
- include/core/plugin.h
+ include/core/plugin.h \
+ include/core/store.h \
+ include/core/time.h
+pkgfeincludedir = $(pkgincludedir)/frontend
+pkgfeinclude_HEADERS = \
+ include/frontend/connection.h \
+ include/frontend/proto.h \
+ include/frontend/sock.h
pkgutilsincludedir = $(pkgincludedir)/utils
pkgutilsinclude_HEADERS = \
- include/utils/llist.h
-
-lib_LTLIBRARIES = libsysdb.la
+ include/utils/channel.h \
+ include/utils/dbi.h \
+ include/utils/error.h \
+ include/utils/llist.h \
+ include/utils/proto.h \
+ include/utils/strbuf.h \
+ include/utils/unixsock.h
+
+pkgclientincludedir = $(pkgincludedir)/client
+pkgclientinclude_HEADERS = \
+ include/client/sock.h \
+ include/client/sysdb.h
+
+lib_LTLIBRARIES = libsysdbclient.la libsysdb.la
+
+libsysdbclient_la_SOURCES = \
+ client/client.c include/client/sysdb.h \
+ client/sock.c include/client/sock.h \
+ utils/error.c include/utils/error.h \
+ utils/proto.c include/utils/proto.h \
+ utils/strbuf.c include/utils/strbuf.h
+libsysdbclient_la_CFLAGS = $(AM_CFLAGS)
+libsysdbclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+libsysdbclient_la_LDFLAGS = -version-info 0:0:0 -pthread
+libsysdbclient_la_LIBADD = $(LIBLTDL)
libsysdb_la_SOURCES = \
sysdb.c include/sysdb.h \
core/plugin.c include/core/plugin.h \
core/store.c include/core/store.h \
include/core/data.h \
- core/error.c include/core/error.h \
frontend/connection.c include/frontend/connection.h \
include/frontend/connection-private.h \
frontend/sock.c include/frontend/sock.h \
frontend/session.c \
+ frontend/query.c \
utils/channel.c include/utils/channel.h \
+ utils/error.c include/utils/error.h \
utils/llist.c include/utils/llist.h \
+ utils/proto.c include/utils/proto.h \
utils/strbuf.c include/utils/strbuf.h \
core/time.c include/core/time.h \
utils/unixsock.c include/utils/unixsock.h
endif
bin_PROGRAMS = sysdbd
+if BUILD_CLIENT
+bin_PROGRAMS += sysdb
+
+# don't use strict CFLAGS for flex code
+noinst_LIBRARIES = sysdb_scanner.a
+sysdb_scanner_a_SOURCES = tools/sysdb/scanner.l
+sysdb_scanner_a_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
+sysdb_SOURCES = tools/sysdb/main.c include/client/sysdb.h \
+ tools/sysdb/input.c tools/sysdb/input.h
+sysdb_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" \
+ $(AM_CFLAGS) @READLINE_CFLAGS@
+sysdb_LDADD = sysdb_scanner.a libsysdbclient.la @READLINE_LIBS@
+endif
-sysdbd_SOURCES = daemon/sysdbd.c include/sysdb.h \
- daemon/config.c include/daemon/config.h
+sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \
+ tools/sysdbd/configfile.c tools/sysdbd/configfile.h
sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
sysdbd_LDADD = libsysdb.la liboconfig/liboconfig.la
sysdbd_DEPENDENCIES = liboconfig/liboconfig.la
sdbconfdir = $(sysconfdir)/sysdb
-dist_sdbconf_DATA = daemon/sysdbd.conf.sample
+dist_sdbconf_DATA = tools/sysdbd/sysdbd.conf.sample
pkgbackendlibdir = $(pkglibdir)/backend
pkgbackendcollectdlibdir = $(pkgbackendlibdir)/collectd
libsysdb_la_DEPENDENCIES += plugins/cname/dns.la
endif
+include/client/sysdb.h: include/client/sysdb.h.in ../version
+ source ../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
+
include/sysdb.h: include/sysdb.h.in ../version
source ../version; sed \
-e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \