Link tests against libust-initializer.o as well

I don't find a proper way to let the libtool Automake magic automatically
link against the initializer object as well. Therefore I need to add it
manually to each testcase.

Signed-off-by: Jan Blunck <jblunck@suse.de>

diff --git a/tests/basic/Makefile.am b/tests/basic/Makefile.am
index 4915f13a558e272f98909115f440a9771c8ae66b..0fa45ea367844fce2c6328581e34ff3878e77064 100644 (file)
--- a/tests/basic/Makefile.am
+++ b/tests/basic/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = basic
 basic_SOURCES = basic.c
-basic_LDADD = $(top_builddir)/libust/libust.la
+basic_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/basic/basic.c b/tests/basic/basic.c
index c1fa806903f3860a8ff0b975dd302468ff91d138..76a67ed2430a62c7b66cb04b7d8a13feaed8a9c3 100644 (file)
--- a/tests/basic/basic.c
+++ b/tests/basic/basic.c
@@ -17,5 +17,3 @@ int main()
 
        return 0;
 }
-
-MARKER_LIB;

diff --git a/tests/basic_long/Makefile.am b/tests/basic_long/Makefile.am
index 9f80a10d97b6170c57eb4778ffb28bd8e494bffd..24c45521bdf00ee5084b8a27d880dbd898fb96c0 100644 (file)
--- a/tests/basic_long/Makefile.am
+++ b/tests/basic_long/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = basic_long
 basic_long_SOURCES = basic_long.c
-basic_long_LDADD = $(top_builddir)/libust/libust.la
+basic_long_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/basic_long/basic_long.c b/tests/basic_long/basic_long.c
index 803d7ea6c1603db5a9eec17f32827076a4685a3d..fa25542e232e3830f09bbd3cfa2b0ff4a3e82310 100644 (file)
--- a/tests/basic_long/basic_long.c
+++ b/tests/basic_long/basic_long.c
@@ -15,5 +15,3 @@ int main()
 
        return 0;
 }
-
-MARKER_LIB;

diff --git a/tests/fork/Makefile.am b/tests/fork/Makefile.am
index 79fe085ebe3c4c736b3db16fedffa1e2f842792b..ef93b6f9bbf19eca9ae00ef3db325c8930613075 100644 (file)
--- a/tests/fork/Makefile.am
+++ b/tests/fork/Makefile.am
@@ -2,9 +2,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = fork fork2
 fork_SOURCES = fork.c
-fork_LDADD = $(top_builddir)/libust/libust.la
+fork_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o
 fork2_SOURCES = fork2.c
-fork2_LDADD = $(top_builddir)/libust/libust.la
+fork2_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/fork/fork.c b/tests/fork/fork.c
index 241ef8121484f065cd7b56fcd5816416f2dc366e..a8e8e4eef99140fa793be0d41f27cb6fc44dc742 100644 (file)
--- a/tests/fork/fork.c
+++ b/tests/fork/fork.c
@@ -44,5 +44,3 @@ int main(int argc, char **argv, char *env[])
 
        return 0;
 }
-
-MARKER_LIB;

diff --git a/tests/fork/fork2.c b/tests/fork/fork2.c
index 63659c47342aea16ee1766e821187662653f873b..ae8f800d5561ffdfb3177e7948137e4e53aa40ba 100644 (file)
--- a/tests/fork/fork2.c
+++ b/tests/fork/fork2.c
@@ -11,5 +11,3 @@ int main()
 
        return 0;
 }
-
-MARKER_LIB;

diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am
index e1046d201ec113e2fb7e6705b46061ce3ba8bad9..aa92ee8cc3b66db244640e6e7f59ab55d516d5f2 100644 (file)
--- a/tests/hello/Makefile.am
+++ b/tests/hello/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c tp.h
-hello_LDADD = $(top_builddir)/libust/libust.la
+hello_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index c48b6df53359474c1410323bbf3f4a3631766093..4463a89f2fcf0e128302a16109f3db5ef6c2fd72 100644 (file)
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -70,6 +70,3 @@ int main()
 
        return 0;
 }
-
-MARKER_LIB;
-TRACEPOINT_LIB;

diff --git a/tests/hello2/Makefile.am b/tests/hello2/Makefile.am
index 2a09dbe28ffde7965f209a956a32ccb0528fb79c..ded9d211f2c7db2d2b3e3c4569b0bec10be81e0a 100644 (file)
--- a/tests/hello2/Makefile.am
+++ b/tests/hello2/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = hello2
 hello2_SOURCES = hello2.c
-hello2_LDADD = $(top_builddir)/libust/libust.la
+hello2_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/hello2/hello2.c b/tests/hello2/hello2.c
index 17e478cfe4ed8bddda83bafff741e14878046536..06639b407c584f26d405338ae2d0007ff0ef8f0b 100644 (file)
--- a/tests/hello2/hello2.c
+++ b/tests/hello2/hello2.c
@@ -29,4 +29,3 @@ int main()
 
        return 0;
 }
-MARKER_LIB;