X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=0b16e4be9f3e7cb7e3b4b9e007f8131a50c7c453;hp=6ba6c2b59b6c42fb0269680da7bc61323f625783;hb=c8fea79c745d42ea8143b7020ae11b4fc2da0d8a;hpb=9fd926379bd4c6c17f2b3c39a5bbf9879bc74e14 diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 6ba6c2b59..0b16e4be9 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,36 +1,43 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -SUBDIRS = compat hashtable kernel-ctl sessiond-comm relayd \ - kernel-consumer ust-consumer testpoint +AUTOMAKE_OPTIONS = subdir-objects + +SUBDIRS = compat health hashtable kernel-ctl sessiond-comm relayd \ + kernel-consumer ust-consumer testpoint index config \ + consumer AM_CFLAGS = -fno-strict-aliasing noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \ uri.h utils.h lttng-kernel-old.h \ - consumer-metadata-cache.h consumer-timer.h + align.h bitfield.h bug.h # Common library noinst_LTLIBRARIES = libcommon.la +EXTRA_DIST = mi_lttng.xsd libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \ common.h futex.c futex.h uri.c uri.h defaults.c \ - pipe.c pipe.h -libcommon_la_LIBADD = -luuid - -# Consumer library -noinst_LTLIBRARIES += libconsumer.la - -libconsumer_la_SOURCES = consumer.c consumer.h consumer-metadata-cache.c \ - consumer-timer.c - -libconsumer_la_LIBADD = \ - $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ - $(top_builddir)/src/common/kernel-consumer/libkernel-consumer.la \ - $(top_builddir)/src/common/hashtable/libhashtable.la \ - $(top_builddir)/src/common/compat/libcompat.la \ - $(top_builddir)/src/common/relayd/librelayd.la - -if HAVE_LIBLTTNG_UST_CTL -libconsumer_la_LIBADD += \ - $(top_builddir)/src/common/ust-consumer/libust-consumer.la -endif + pipe.c pipe.h readwrite.c readwrite.h \ + mi-lttng.h mi-lttng.c \ + daemonize.c daemonize.h \ + sessiond-comm/unix.c sessiond-comm/unix.h + +libcommon_la_LIBADD = \ + -luuid \ + -lrt \ + $(top_builddir)/src/common/config/libconfig.la + +all-local: + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ + for script in $(EXTRA_DIST); do \ + cp -f $(srcdir)/$$script $(builddir); \ + done; \ + fi + +clean-local: + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ + for script in $(EXTRA_DIST); do \ + rm -f $(builddir)/$$script; \ + done; \ + fi