projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: include stdlib.h in compat/string.h
[lttng-tools.git]
/
tests
/
regression
/
ust
/
multi-lib
/
Makefile.am
diff --git
a/tests/regression/ust/multi-lib/Makefile.am
b/tests/regression/ust/multi-lib/Makefile.am
index 3fb4ae74ec8f6605fe3a310ed1230f7fd81f358d..52a1635c24671a952736cd8fbc0e744e51574c9e 100644
(file)
--- a/
tests/regression/ust/multi-lib/Makefile.am
+++ b/
tests/regression/ust/multi-lib/Makefile.am
@@
-3,16
+3,16
@@
EXTRA_DIST = test_multi_lib
noinst_PROGRAMS = exec-with-callsites exec-without-callsites
exec_with_callsites_SOURCES = multi-lib-test.c callsites.c
noinst_PROGRAMS = exec-with-callsites exec-without-callsites
exec_with_callsites_SOURCES = multi-lib-test.c callsites.c
-exec_with_callsites_LDFLAGS =
-ldl -lpopt
-exec_with_callsites_CFLAGS = $(AM_CFLAGS) -DHAS_CALLSITES=1
+exec_with_callsites_LDFLAGS =
$(DL_LIBS) $(POPT_LIBS)
+exec_with_callsites_CFLAGS = $(
POPT_CFLAGS) $(
AM_CFLAGS) -DHAS_CALLSITES=1
exec_without_callsites_SOURCES = multi-lib-test.c
exec_without_callsites_SOURCES = multi-lib-test.c
-exec_without_callsites_LDFLAGS =
-ldl -lpopt -llttng-ust
+exec_without_callsites_LDFLAGS =
$(DL_LIBS) $(POPT_LIBS) $(UST_LIBS)
exec_without_callsites_LDADD = probes.o
exec_without_callsites_LDADD = probes.o
-exec_without_callsites_CFLAGS = $(AM_CFLAGS) -DHAS_CALLSITES=0
+exec_without_callsites_CFLAGS = $(
POPT_CFLAGS) $(
AM_CFLAGS) -DHAS_CALLSITES=0
PROBES_SRC=probes.c probes.h
PROBES_SRC=probes.c probes.h
-PROBES_LDF=-shared -module
-llttng-ust
-avoid-version -rpath $(abs_builddir)/.libs/
+PROBES_LDF=-shared -module
$(UST_LIBS)
-avoid-version -rpath $(abs_builddir)/.libs/
PROBES_CF=$(AM_CFLAGS) $(AM_CPPFLAGS) $(CFLAGS) $(CPPFLAGS) -c -I$(srcdir)/
probes.o: probes.c probes.h
PROBES_CF=$(AM_CFLAGS) $(AM_CPPFLAGS) $(CFLAGS) $(CPPFLAGS) -c -I$(srcdir)/
probes.o: probes.c probes.h
@@
-29,7
+29,7
@@
noinst_LTLIBRARIES = libprobes_a.la libprobes_a_prime.la \
noinst_LTLIBRARIES += libcallsites_1.la libcallsites_2.la
CALLSITES_SRC=callsites.c callsites.h
noinst_LTLIBRARIES += libcallsites_1.la libcallsites_2.la
CALLSITES_SRC=callsites.c callsites.h
-CALLSITES_LDF=-shared -module
-llttng-ust
-avoid-version -rpath $(abs_builddir)/.libs/
+CALLSITES_LDF=-shared -module
$(UST_LIBS)
-avoid-version -rpath $(abs_builddir)/.libs/
CALLSITES_CF=-c -I.
libprobes_a_la_SOURCES = $(PROBES_SRC)
CALLSITES_CF=-c -I.
libprobes_a_la_SOURCES = $(PROBES_SRC)
This page took
0.024526 seconds
and
4
git commands to generate.