]>
Commit | Line | Data |
---|---|---|
bab9183b JB |
1 | --- CUnit-2.1-2/Examples/AutomatedTest/Makefile.am.orig 2010-10-14 10:43:09.000000000 +0200 |
2 | +++ CUnit-2.1-2/Examples/AutomatedTest/Makefile.am 2013-10-15 20:21:48.537466937 +0200 | |
3 | @@ -8,8 +8,8 @@ if ENABLE_AUTOMATED | |
854ef19a ER |
4 | example_PROGRAMS = AutomatedTest |
5 | ||
bab9183b | 6 | AutomatedTest_SOURCES = AutomatedTest.c |
854ef19a | 7 | -AutomatedTest_LDADD = -lcunit -lcunitexamples |
bab9183b JB |
8 | -AutomatedTest_LDFLAGS = -L.. -lm |
9 | +AutomatedTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
10 | +AutomatedTest_LDFLAGS = -lm | |
854ef19a ER |
11 | INCLUDES = -I.. |
12 | ||
bab9183b JB |
13 | if ENABLE_CURSES |
14 | --- CUnit-2.1-2/Examples/BasicTest/Makefile.am.orig 2010-10-14 10:39:59.000000000 +0200 | |
15 | +++ CUnit-2.1-2/Examples/BasicTest/Makefile.am 2013-10-15 20:22:26.284132020 +0200 | |
16 | @@ -8,8 +8,8 @@ if ENABLE_BASIC | |
854ef19a ER |
17 | example_PROGRAMS = BasicTest |
18 | ||
bab9183b | 19 | BasicTest_SOURCES = BasicTest.c |
854ef19a | 20 | -BasicTest_LDADD = -lcunit -lcunitexamples |
bab9183b JB |
21 | -BasicTest_LDFLAGS = -L.. -lm |
22 | +BasicTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
23 | +BasicTest_LDFLAGS = -lm | |
854ef19a ER |
24 | INCLUDES = -I.. |
25 | ||
bab9183b JB |
26 | if ENABLE_CURSES |
27 | --- CUnit-2.1-2/Examples/ConsoleTest/Makefile.am.orig 2010-10-14 10:42:08.000000000 +0200 | |
28 | +++ CUnit-2.1-2/Examples/ConsoleTest/Makefile.am 2013-10-15 20:23:13.677463364 +0200 | |
29 | @@ -8,8 +8,8 @@ if ENABLE_CONSOLE | |
854ef19a ER |
30 | example_PROGRAMS = ConsoleTest |
31 | ||
bab9183b | 32 | ConsoleTest_SOURCES = ConsoleTest.c |
854ef19a | 33 | -ConsoleTest_LDADD = -lcunit -lcunitexamples |
bab9183b JB |
34 | -ConsoleTest_LDFLAGS = -L.. -lm |
35 | +ConsoleTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
36 | +ConsoleTest_LDFLAGS = -lm | |
854ef19a ER |
37 | INCLUDES = -I.. |
38 | ||
bab9183b JB |
39 | if ENABLE_CURSES |
40 | --- CUnit-2.1-2/Examples/CursesTest/Makefile.am.orig 2010-10-14 10:42:37.000000000 +0200 | |
41 | +++ CUnit-2.1-2/Examples/CursesTest/Makefile.am 2013-10-15 20:23:46.394128658 +0200 | |
42 | @@ -8,8 +8,8 @@ if ENABLE_CURSES | |
854ef19a ER |
43 | example_PROGRAMS = CursesTest |
44 | ||
bab9183b JB |
45 | CursesTest_SOURCES = CursesTest.c |
46 | -CursesTest_LDADD = -lcunit -lcunitexamples | |
47 | -CursesTest_LDFLAGS = -L.. -lm | |
48 | +CursesTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
49 | +CursesTest_LDFLAGS = -lm | |
854ef19a ER |
50 | INCLUDES = -I.. |
51 | ||
bab9183b JB |
52 | if ENABLE_CURSES |
53 | --- CUnit-2.1-2/CUnit/Sources/Test/Makefile.am.orig 2006-03-21 02:30:54.000000000 +0100 | |
54 | +++ CUnit-2.1-2/CUnit/Sources/Test/Makefile.am 2013-10-15 20:41:40.950750230 +0200 | |
55 | @@ -5,8 +5,7 @@ | |
56 | ||
57 | test_PROGRAMS = test_cunit | |
58 | test_cunit_SOURCES = test_cunit.c | |
59 | -test_cunit_LDADD = ../libcunit_test.a | |
60 | -test_cunit_LDFLAGS = -L.. | |
61 | +test_cunit_LDADD = $(top_builddir)/CUnit/Sources/libcunit_test.a | |
62 | ||
63 | INCLUDES = -I../../Headers -DMEMTRACE -DCUNIT_BUILD_TESTS -DCUNIT_DO_NOT_DEFINE_UNLESS_BUILDING_TESTS | |
64 | endif | |
65 | --- CUnit-2.1-2/CUnit/Sources/Makefile.am.orig 2006-03-21 02:30:53.000000000 +0100 | |
66 | +++ CUnit-2.1-2/CUnit/Sources/Makefile.am 2013-10-16 16:20:48.227781246 +0200 | |
67 | @@ -69,6 +69,9 @@ | |
68 | libcunit_la_LIBADD = $(OBJECT_FILES_SHARED) | |
69 | libcunit_la_LDFLAGS = -version-info @LIBTOOL_CURRENT@:@LIBTOOL_REVISION@:@LIBTOOL_AGE@ | |
70 | ||
71 | +if ENABLE_CURSES | |
72 | +libcunit_la_LIBADD += -l$(CURSES_LIB) | |
73 | +endif | |
74 | ||
75 | if ENABLE_TEST | |
76 | noinst_LIBRARIES = libcunit_test.a |