X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=672b90bd46a8fb3ba39d8561063159a97df4cff9;hp=cdadd60a80932f37df8a0dddf987ecbcb045249e;hb=56b97a180a53aecbfe9f7162b8ece3faae973cf9;hpb=c3cfa4bb8d3c986b4c6744d73defa8eba08fcb72 diff --git a/src/Makefile.am b/src/Makefile.am index cdadd60..672b90b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = liboconfig # coverage related flags are only set when gcov is enabled -AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@ -AM_LDFLAGS = @COVERAGE_LDFLAGS@ +AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@ +AM_LDFLAGS = @COVERAGE_LDFLAGS@ @PROFILING_LDFLAGS@ AM_CPPFLAGS = -I"${top_srcdir}/src/include" AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' @@ -25,6 +25,7 @@ pkgcoreinclude_HEADERS = \ pkgfeincludedir = $(pkgincludedir)/frontend pkgfeinclude_HEADERS = \ include/frontend/connection.h \ + include/frontend/parser.h \ include/frontend/proto.h \ include/frontend/sock.h pkgutilsincludedir = $(pkgincludedir)/utils @@ -42,8 +43,7 @@ pkgclientinclude_HEADERS = \ include/client/sock.h \ include/client/sysdb.h -lib_LTLIBRARIES = libsysdbclient.la libsysdb.la -noinst_LTLIBRARIES = +noinst_LTLIBRARIES = libsysdbclient.la libsysdb.la libsysdbclient_la_SOURCES = \ client/client.c include/client/sysdb.h \ @@ -60,13 +60,16 @@ libsysdbclient_la_LIBADD = $(LIBLTDL) noinst_LTLIBRARIES += libsysdb_fe_parser.la libsysdb_fe_parser_la_SOURCES = \ frontend/grammar.y frontend/scanner.l -libsysdb_fe_parser_la_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" +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/object.c include/core/object.h \ core/plugin.c include/core/plugin.h \ core/store.c include/core/store.h \ - include/core/data.h \ + core/store-private.h \ + core/store_lookup.c \ + core/data.c include/core/data.h \ frontend/connection.c include/frontend/connection.h \ frontend/connection-private.h \ frontend/parser.c include/frontend/parser.h \ @@ -76,6 +79,7 @@ libsysdb_la_SOURCES = \ utils/channel.c include/utils/channel.h \ utils/error.c include/utils/error.h \ utils/llist.c include/utils/llist.h \ + utils/os.c include/utils/os.h \ utils/proto.c include/utils/proto.h \ utils/strbuf.c include/utils/strbuf.h \ core/time.c include/core/time.h \ @@ -100,20 +104,31 @@ bin_PROGRAMS += sysdb # don't use strict CFLAGS for flex code noinst_LTLIBRARIES += libsysdb_scanner.la libsysdb_scanner_la_SOURCES = tools/sysdb/scanner.l -libsysdb_scanner_la_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" +libsysdb_scanner_la_CFLAGS = @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@ \ + -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" 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/input.c tools/sysdb/input.h \ + core/object.c include/core/object.h \ + utils/llist.c include/utils/llist.h sysdb_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" \ $(AM_CFLAGS) @READLINE_CFLAGS@ sysdb_LDADD = libsysdb_scanner.la libsysdbclient.la @READLINE_LIBS@ endif sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \ - tools/sysdbd/configfile.c tools/sysdbd/configfile.h + tools/sysdbd/configfile.c tools/sysdbd/configfile.h \ + $(libsysdb_la_SOURCES) sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" -sysdbd_LDADD = libsysdb.la liboconfig/liboconfig.la -sysdbd_DEPENDENCIES = liboconfig/liboconfig.la +sysdbd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) +sysdbd_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -pthread +sysdbd_LDADD = libsysdb_fe_parser.la liboconfig/liboconfig.la \ + $(LIBLTDL) -lrt +sysdbd_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la + +if BUILD_WITH_LIBDBI +sysdbd_LDADD += -ldbi +endif sdbconfdir = $(sysconfdir)/sysdb dist_sdbconf_DATA = tools/sysdbd/sysdbd.conf.sample @@ -133,40 +148,40 @@ if BUILD_PLUGIN_CNAMEDNS pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la plugins_cname_dns_la_SOURCE = plugins/cname/dns.c 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 +sysdbd_LDADD += -dlopen plugins/cname/dns.la +sysdbd_DEPENDENCIES += plugins/cname/dns.la endif if BUILD_PLUGIN_COLLECTD pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la backend_collectd_unixsock_la_SOURCES = backend/collectd/unixsock.c 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 +sysdbd_LDADD += -dlopen backend/collectd/unixsock.la +sysdbd_DEPENDENCIES += backend/collectd/unixsock.la 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 = $(AM_LDFLAGS) -module -avoid-version -libsysdb_la_LIBADD += -dlopen backend/mk-livestatus.la -libsysdb_la_DEPENDENCIES += backend/mk-livestatus.la +sysdbd_LDADD += -dlopen backend/mk-livestatus.la +sysdbd_DEPENDENCIES += backend/mk-livestatus.la 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 = $(AM_LDFLAGS) -module -avoid-version -libsysdb_la_LIBADD += -dlopen backend/puppet/store-configs.la -libsysdb_la_DEPENDENCIES += backend/puppet/store-configs.la +sysdbd_LDADD += -dlopen backend/puppet/store-configs.la +sysdbd_DEPENDENCIES += backend/puppet/store-configs.la endif if BUILD_PLUGIN_SYSLOG pkglib_LTLIBRARIES += plugins/syslog.la plugins_syslog_la_SOURCE = plugins/syslog.c plugins_syslog_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -libsysdb_la_LIBADD += -dlopen plugins/syslog.la -libsysdb_la_DEPENDENCIES += plugins/syslog.la +sysdbd_LDADD += -dlopen plugins/syslog.la +sysdbd_DEPENDENCIES += plugins/syslog.la endif include/client/sysdb.h: include/client/sysdb.h.in ../version