projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Don't override user variables within the build system
[lttng-tools.git]
/
tests
/
regression
/
ust
/
linking
/
Makefile.am
diff --git
a/tests/regression/ust/linking/Makefile.am
b/tests/regression/ust/linking/Makefile.am
index 9f7ebecb9e8d8d3dbe1de3ae93d29af653c6d99d..c70bc53a2eccaed40aebc4d5b87b19cc269dc247 100644
(file)
--- a/
tests/regression/ust/linking/Makefile.am
+++ b/
tests/regression/ust/linking/Makefile.am
@@
-1,6
+1,6
@@
# -Wsystem-headers is needed to print warnings in the tracepoint
# description file.
# -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.
# Set LIBS to nothing so the application does not link on useless
# libraries.
@@
-10,7
+10,7
@@
LIBS =
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_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
# Build a version statically linked to the providers
# contains ust_tests_demo.h and ust_tests_demo2.h provider probes
@@
-44,7
+44,16
@@
endif
noinst_PROGRAMS = demo_builtin demo_static
noinst_PROGRAMS = demo_builtin demo_static
-if !NO_SHARED
+COPYSCRIPTS = test_linking test_linking.py demo_preload
+noinst_SCRIPTS = $(COPYSCRIPTS)
+
+if NO_SHARED
+
+EXTRA_DIST = tp.c ust_tests_demo.h tp2.c ust_tests_demo2.h \
+ tp3.c ust_tests_demo3.h demo.c ust_tests_demo.h \
+ $(COPYSCRIPTS)
+
+else
# Force the shared flag on the noinst libraries since they are
# only built static by default
FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
# Force the shared flag on the noinst libraries since they are
# only built static by default
FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
@@
-70,7
+79,7
@@
liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
noinst_PROGRAMS += demo
demo_SOURCES = demo.c ust_tests_demo.h
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
if LTTNG_TOOLS_BUILD_WITH_LIBDL
demo_LDADD = -ldl
@@
-79,21
+88,20
@@
if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
demo_LDADD = -lc
endif
demo_LDADD = -lc
endif
-endif
+EXTRA_DIST = $(COPYSCRIPTS)
-noinst_SCRIPTS = test_linking test_linking.py demo_preload
-EXTRA_DIST = test_linking test_linking.py demo_preload
+endif
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for script in $(
EXTRA_DIST
); do \
+ for script in $(
COPYSCRIPTS
); do \
cp -f $(srcdir)/$$script $(builddir); \
done; \
fi
clean-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
cp -f $(srcdir)/$$script $(builddir); \
done; \
fi
clean-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for script in $(
EXTRA_DIST
); do \
+ for script in $(
COPYSCRIPTS
); do \
rm -f $(builddir)/$$script; \
done; \
fi
rm -f $(builddir)/$$script; \
done; \
fi
This page took
0.027617 seconds
and
4
git commands to generate.