sysdb: Use the flex scanner generator for reading input.

[sysdb.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5a18c7be82abc563d64f751052030c6c8a25eb3b..fea709ecbdf43d4565a1c4b0c8daef2502d85eed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,6 @@ pkginclude_HEADERS = include/sysdb.h
 pkgcoreincludedir = $(pkgincludedir)/core
 pkgcoreinclude_HEADERS = \
                include/core/data.h \
-               include/core/error.h \
                include/core/object.h \
                include/core/plugin.h \
                include/core/store.h \
@@ -26,6 +25,7 @@ pkgutilsincludedir = $(pkgincludedir)/utils
 pkgutilsinclude_HEADERS = \
                include/utils/channel.h \
                include/utils/dbi.h \
+               include/utils/error.h \
                include/utils/llist.h \
                include/utils/proto.h \
                include/utils/strbuf.h \
@@ -41,6 +41,7 @@ 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)
@@ -54,13 +55,13 @@ libsysdb_la_SOURCES = \
                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 \
@@ -78,20 +79,29 @@ libsysdb_la_SOURCES += \
 libsysdb_la_LIBADD += -ldbi
 endif
 
-bin_PROGRAMS = sysdb sysdbd
-
-sysdb_SOURCES = client/sysdb.c include/client/sysdb.h
-sysdb_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
-sysdb_LDADD = libsysdbclient.la
+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