diff --git a/src/Makefile.am b/src/Makefile.am
index 4bbc3fb582c04be5ff665bd521dac1698d68bf02..3f5a0071081afd13a71189fb87b6900d20bf9e5e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
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)
libsysdb_la_LIBADD += -ldbi
endif
-bin_PROGRAMS = sysdb sysdbd
+bin_PROGRAMS = sysdbd
+if BUILD_CLIENT
+bin_PROGRAMS += sysdb
-sysdb_SOURCES = client/sysdb.c include/client/sysdb.h
-sysdb_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
-sysdb_LDADD = libsysdbclient.la
+sysdb_SOURCES = tools/sysdb/main.c include/client/sysdb.h
+sysdb_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" \
+ $(AM_CFLAGS) @READLINE_CFLAGS@
+sysdb_LDADD = 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