AC_CANONICAL_TARGET
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax nostdinc])
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
AX_LIB_SOCKET_NSL
[Specify the installation prefix of the kmod library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
- CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
[Specify the installation prefix of the lttng-ust library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
- CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
# export flex condition
AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
+AC_SUBST(AM_CFLAGS)
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
+AC_SUBST(AM_CPPFLAGS)
lttngincludedir="${includedir}/lttng"
lttng.i: lttng.i.in
$(SED) "s/LTTNG_VERSION_STR/LTTng $(PACKAGE_VERSION)/g" < $(srcdir)/lttng.i.in >lttng.i
-AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include
+AM_CPPFLAGS += $(PYTHON_INCLUDE)
EXTRA_DIST = lttng.i.in
nodist_python_PYTHON = lttng.py
-AM_CFLAGS = -O2 -g
-AM_LDFLAGS =
-
noinst_PROGRAMS = crash
crash_SOURCES = crash.c
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
lttnglibexec_PROGRAMS = lttng-consumerd
lttng_consumerd_SOURCES = lttng-consumerd.c \
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -DINSTALL_BIN_PATH=\""$(bindir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(bindir)"\"
bin_PROGRAMS = lttng-crash
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
- -DINSTALL_LIB_PATH=\""$(libdir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+ -DINSTALL_LIB_PATH=\""$(libdir)"\"
AM_CFLAGS = -fno-strict-aliasing
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
- -DINSTALL_LIB_PATH=\""$(libdir)"\"
+AM_CPPFLAGS +=-DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+ -DINSTALL_LIB_PATH=\""$(libdir)"\"
AM_CFLAGS = -fno-strict-aliasing
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -DINSTALL_BIN_PATH=\""$(bindir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(bindir)"\"
AUTOMAKE_OPTIONS = subdir-objects
#include <inttypes.h>
#include <ctype.h>
-#include <src/common/sessiond-comm/sessiond-comm.h>
+#include <common/sessiond-comm/sessiond-comm.h>
#include <common/compat/string.h>
/* Mi dependancy */
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS =
SUBDIRS += consumer
endif
-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 \
align.h bitfield.h bug.h time.h
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_LTLIBRARIES = libcompat.la
if COMPAT_EPOLL
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_LTLIBRARIES = libconfig.la
libconfig_la_SOURCES = ini.c ini.h session-config.c session-config.h \
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
# Consumer library
noinst_LTLIBRARIES = libconsumer.la
#include <urcu/system.h>
-#include <src/common/daemonize.h>
-#include <src/common/error.h>
+#include <common/daemonize.h>
+#include <common/error.h>
LTTNG_HIDDEN
int lttng_daemonize(pid_t *child_ppid, int *completion_flag,
#define _DEFAULTS_H
#include <pthread.h>
-#include <src/common/macros.h>
+#include <common/macros.h>
/* Default unix group name for tracing. */
#define DEFAULT_TRACING_GROUP "tracing"
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_LTLIBRARIES = libhashtable.la
libhashtable_la_SOURCES = hashtable.c hashtable.h \
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_LTLIBRARIES = libhealth.la
libhealth_la_SOURCES = health.c
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_LTLIBRARIES = libindex.la
libindex_la_SOURCES = index.c index.h ctf-index.h
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
# Kernel consumer library
noinst_LTLIBRARIES = libkernel-consumer.la
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_LTLIBRARIES = libkernel-ctl.la
libkernel_ctl_la_SOURCES = kernel-ctl.c kernel-ctl.h kernel-ioctl.h
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
# Relayd library
noinst_LTLIBRARIES = librelayd.la
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
# Session daemon communication lib
noinst_LTLIBRARIES = libsessiond-comm.la
-AM_CPPFLAGS =
-
noinst_LTLIBRARIES = libtestpoint.la
libtestpoint_la_SOURCES = testpoint.h testpoint.c
if HAVE_LIBLTTNG_UST_CTL
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_LTLIBRARIES = libust-consumer.la
libust_consumer_la_SOURCES = ust-consumer.c ust-consumer.h
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(builddir)
-
SUBDIRS = filter
+AM_CPPFLAGS += -I$(srcdir) -I$(builddir)
+
lib_LTLIBRARIES = liblttng-ctl.la
liblttng_ctl_la_SOURCES = lttng-ctl.c snapshot.c lttng-ctl-helper.h \
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -I$(srcdir) -I$(builddir)
+AM_CPPFLAGS += -I$(srcdir) -I$(builddir)
noinst_PROGRAMS = filter-grammar-test
noinst_LTLIBRARIES = libfilter.la
filter-bytecode.h \
filter-ir.h \
memstream.h
-libfilter_la_CFLAGS = -include filter-symbols.h
+libfilter_la_CFLAGS = -include filter-symbols.h $(AM_CFLAGS)
AM_YFLAGS = -t -d -v
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
EXTRA_DIST = test_event_basic test_all_events test_syscall \
test_clock_override test_rotation_destroy_flush \
test_select_poll_epoll
noinst_PROGRAMS = select_poll_epoll
select_poll_epoll_SOURCES = select_poll_epoll.c
select_poll_epoll_LDADD = -lpthread -lpopt
-select_poll_epoll_CFLAGS = -fno-stack-protector -D_FORTIFY_SOURCE=0
+select_poll_epoll_CFLAGS = -fno-stack-protector -D_FORTIFY_SOURCE=0 $(AM_CFLAGS)
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
noinst_SCRIPTS = test_crash
EXTRA_DIST = test_crash
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -I$(srcdir) -O2 -g
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests -I$(srcdir)
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
-AM_CFLAGS = -I. -O2 -g -I$(top_srcdir)/include
-AM_LDFLAGS =
+AM_CPPFLAGS += -I. -I$(top_srcdir)/include
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
noinst_PROGRAMS = validate_xml extract_xml
validate_xml_SOURCES = validate_xml.c
validate_xml_CPPFLAGS = $(libxml2_CFLAGS) $(AM_CPPFLAGS)
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -I$(srcdir) -O2 -g
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests -I$(srcdir)
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
objcopy_verbose_ = $(objcopy_verbose_@AM_DEFAULT_V@)
objcopy_verbose_0 = @echo OBJCOPY $@;
-AM_CPPFLAGS = -I$(srcdir) -g
+AM_CPPFLAGS += -I$(srcdir) -g
noinst_PROGRAMS = prog
prog_SOURCES = prog.c tp.c tp.h
else
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/src
-
# The rpath is necessary because libtool won't build a shared library
# if it's noinst_
GETCPU_LIBTOOL_FLAGS = \
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
noinst_PROGRAMS = daemon
daemon_SOURCES = daemon.c ust_tests_daemon.h
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
noinst_PROGRAMS = exit-fast
exit_fast_SOURCES = exit-fast.c ust_tests_exitfast.h
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
noinst_PROGRAMS = fork fork2
fork_SOURCES = fork.c ust_tests_fork.h
else
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/src
-
# The rpath is necessary because libtool won't build a shared library
# if it's noinst_
GETCPU_LIBTOOL_FLAGS = \
-AM_CFLAGS = -I$(srcdir) -O2
-AM_LDFLAGS = -llttng-ust
+AM_CPPFLAGS += -I$(srcdir)
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
-AM_CPPFLAGS = -I$(srcdir)
-
noinst_PROGRAMS = prog
prog_SOURCES = prog.c
prog_LDADD = -llttng-ust -llttng-ust-libc-wrapper
# -Wsystem-headers is needed to print warnings in the tracepoint
# description file.
-AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
# Set LIBS to nothing so the application does not link on useless
# libraries.
demo_builtin_SOURCES = demo.c tp.c tp2.c tp3.c ust_tests_demo.h \
ust_tests_demo2.h ust_tests_demo3.h
demo_builtin_LDADD = -llttng-ust
-demo_builtin_CFLAGS = -Werror=old-style-definition
+demo_builtin_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS)
# Build a version statically linked to the providers
# contains ust_tests_demo.h and ust_tests_demo2.h provider probes
noinst_PROGRAMS += demo
demo_SOURCES = demo.c ust_tests_demo.h
-demo_CFLAGS = -DTEST_DYNAMIC_LINKAGE
+demo_CFLAGS = -DTEST_DYNAMIC_LINKAGE $(AM_CFLAGS)
if LTTNG_TOOLS_BUILD_WITH_LIBDL
demo_LDADD = -ldl
-AM_CFLAGS = -I$(srcdir) -O2
-AM_LDFLAGS = -llttng-ust
+AM_CPPFLAGS += -I$(srcdir)
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
-AM_CFLAGS = -I$(srcdir) -O2
-AM_LDFLAGS = -llttng-ust
+AM_CFLAGS += -I$(srcdir)
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
else
-AM_CFLAGS=-I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
# Force the shared flag on the noinst libraries since they are
# only built static by default
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
noinst_PROGRAMS = type-declarations
type_declarations_SOURCES = type-declarations.c ust_tests_td.h
objcopy_verbose_ = $(objcopy_verbose_@AM_DEFAULT_V@)
objcopy_verbose_0 = @echo OBJCOPY $@;
-AM_CPPFLAGS = -I$(srcdir) -g
+AM_CPPFLAGS += -I$(srcdir) -g
noinst_PROGRAMS = prog
prog_SOURCES = prog.c
SUBDIRS = ini_config
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
LOG_DRIVER_FLAGS='--merge'
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
LIBCONFIG=$(top_builddir)/src/common/config/libconfig.la
#include <tap/tap.h>
-#include <src/common/utils.h>
-
+#include <common/utils.h>
#include <common/common.h>
/* For error.h */
#include <tap/tap.h>
-#include <src/common/utils.h>
+#include <common/utils.h>
/* For error.h */
int lttng_opt_quiet = 1;
SUBDIRS = . tap testapp
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_processes.sh
dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl
noinst_LTLIBRARIES = libtestutils.la
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/utils/testapp \
- -I$(srcdir) -O2 -g
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) -I$(top_srcdir)/tests/utils/testapp
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) \
- -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/utils/testapp \
- -O2 -g
+AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/utils/testapp
if LTTNG_TOOLS_BUILD_WITH_LIBDL
LIBS += -ldl
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) -O2 -g \
- -I$(top_srcdir)/tests/utils/testapp
+AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils/testapp
AM_LDFLAGS =
if LTTNG_TOOLS_BUILD_WITH_LIBDL
-LIBS += -ldl
+AM_LDFLAGS += -ldl
endif
if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-LIBS += -lc
+AM_LDFLAGS += -lc
endif
if HAVE_LIBLTTNG_UST_CTL
projects / deliverable / lttng-tools.git / commitdiff
