From 2cd35d512eb5bc63c2f9ebc1b748a54cd03cc4b3 Mon Sep 17 00:00:00 2001
From: Jan Blunck <jblunck@suse.de>
Date: Thu, 5 Nov 2009 16:24:09 +0100
Subject: [PATCH] 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>
---
 tests/basic/Makefile.am       | 2 +-
 tests/basic/basic.c           | 2 --
 tests/basic_long/Makefile.am  | 2 +-
 tests/basic_long/basic_long.c | 2 --
 tests/fork/Makefile.am        | 4 ++--
 tests/fork/fork.c             | 2 --
 tests/fork/fork2.c            | 2 --
 tests/hello/Makefile.am       | 2 +-
 tests/hello/hello.c           | 3 ---
 tests/hello2/Makefile.am      | 2 +-
 tests/hello2/hello2.c         | 1 -
 11 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/tests/basic/Makefile.am b/tests/basic/Makefile.am
index 4915f13..0fa45ea 100644
--- 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 c1fa806..76a67ed 100644
--- 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 9f80a10..24c4552 100644
--- 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 803d7ea..fa25542 100644
--- 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 79fe085..ef93b6f 100644
--- 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 241ef81..a8e8e4e 100644
--- 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 63659c4..ae8f800 100644
--- 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 e1046d2..aa92ee8 100644
--- 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 c48b6df..4463a89 100644
--- 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 2a09dbe..ded9d21 100644
--- 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 17e478c..06639b4 100644
--- a/tests/hello2/hello2.c
+++ b/tests/hello2/hello2.c
@@ -29,4 +29,3 @@ int main()
 
 	return 0;
 }
-MARKER_LIB;
-- 
2.34.1