X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=53872e79a6a4b95d26959badc253d79c82be8cf9;hb=71acc30b699236191c33df8cba0e62ab97fe8d2d;hp=724bfaae7a7e45c8fa15179d5a9c6cf5475f6c4a;hpb=55f329ab567091e3203809ca35af766e45966b45;p=sysdb.git diff --git a/src/Makefile.am b/src/Makefile.am index 724bfaa..53872e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,9 @@ SUBDIRS = liboconfig -AM_CFLAGS = @STRICT_CFLAGS@ -AM_CPPFLAGS = -Iinclude +# coverage related flags are only set when gcov is enabled +AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@ +AM_LDFLAGS = @COVERAGE_LDFLAGS@ +AM_CPPFLAGS = -I"${top_srcdir}/src/include" AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"' @@ -12,7 +14,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 \ @@ -20,11 +21,13 @@ pkgcoreinclude_HEADERS = \ pkgfeincludedir = $(pkgincludedir)/frontend pkgfeinclude_HEADERS = \ include/frontend/connection.h \ + include/frontend/proto.h \ include/frontend/sock.h 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 \ @@ -32,18 +35,20 @@ pkgutilsinclude_HEADERS = \ pkgclientincludedir = $(pkgincludedir)/client pkgclientinclude_HEADERS = \ - include/client/sock.h + 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_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 -pthread libsysdbclient_la_LIBADD = $(LIBLTDL) libsysdb_la_SOURCES = \ @@ -52,13 +57,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 \ @@ -66,7 +71,7 @@ libsysdb_la_SOURCES = \ utils/unixsock.c include/utils/unixsock.h libsysdb_la_CFLAGS = $(AM_CFLAGS) libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) -libsysdb_la_LDFLAGS = -version-info 0:0:0 -pthread +libsysdb_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 -pthread libsysdb_la_LIBADD = $(LIBLTDL) -lrt liboconfig/liboconfig.la libsysdb_la_DEPENDENCIES = liboconfig/liboconfig.la @@ -76,20 +81,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 = libsysdb_scanner.a +libsysdb_scanner_a_SOURCES = tools/sysdb/scanner.l +libsysdb_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 = libsysdb_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 @@ -105,7 +119,7 @@ pkgcnamelib_LTLIBRARIES = if BUILD_PLUGIN_COLLECTD pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la backend_collectd_unixsock_la_SOURCES = backend/collectd/unixsock.c -backend_collectd_unixsock_la_LDFLAGS = -module -avoid-version +backend_collectd_unixsock_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version libsysdb_la_LIBADD += -dlopen backend/collectd/unixsock.la libsysdb_la_DEPENDENCIES += backend/collectd/unixsock.la endif @@ -113,7 +127,7 @@ endif if BUILD_PLUGIN_MKLIVESTATUS pkgbackendlib_LTLIBRARIES += backend/mk-livestatus.la backend_mk_livestatus_la_SOURCES = backend/mk-livestatus.c -backend_mk_livestatus_la_LDFLAGS = -module -avoid-version +backend_mk_livestatus_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version libsysdb_la_LIBADD += -dlopen backend/mk-livestatus.la libsysdb_la_DEPENDENCIES += backend/mk-livestatus.la endif @@ -121,7 +135,7 @@ endif if BUILD_PLUGIN_PUPPETSTORECONFIGS pkgbackendpuppetlib_LTLIBRARIES += backend/puppet/store-configs.la backend_puppet_store_configs_la_SOURCES = backend/puppet/store-configs.c -backend_puppet_store_configs_la_LDFLAGS = -module -avoid-version +backend_puppet_store_configs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version libsysdb_la_LIBADD += -dlopen backend/puppet/store-configs.la libsysdb_la_DEPENDENCIES += backend/puppet/store-configs.la endif @@ -129,7 +143,7 @@ endif if BUILD_PLUGIN_SYSLOG pkglib_LTLIBRARIES += plugins/syslog.la plugins_syslog_la_SOURCE = plugins/syslog.c -plugins_syslog_la_LDFLAGS = -module -avoid-version +plugins_syslog_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version libsysdb_la_LIBADD += -dlopen plugins/syslog.la libsysdb_la_DEPENDENCIES += plugins/syslog.la endif @@ -137,7 +151,7 @@ endif if BUILD_PLUGIN_CNAMEDNS pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la plugins_cname_dns_la_SOURCE = plugins/cname/dns.c -plugins_cname_dns_la_LDFLAGS = -module -avoid-version +plugins_cname_dns_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version libsysdb_la_LIBADD += -dlopen plugins/cname/dns.la libsysdb_la_DEPENDENCIES += plugins/cname/dns.la endif