]>
Commit | Line | Data |
---|---|---|
82dfa258 MK |
1 | diff -urNp -x '*.orig' CUnit-2.1-3.org/CUnit/Sources/Makefile.am CUnit-2.1-3/CUnit/Sources/Makefile.am |
2 | --- CUnit-2.1-3.org/CUnit/Sources/Makefile.am 2014-04-24 02:54:45.000000000 +0200 | |
3 | +++ CUnit-2.1-3/CUnit/Sources/Makefile.am 2023-07-23 15:06:33.699436526 +0200 | |
4 | @@ -69,6 +69,9 @@ libcunit_la_SOURCES = | |
5 | libcunit_la_LIBADD = $(OBJECT_FILES_SHARED) | |
6 | libcunit_la_LDFLAGS = -version-info @LIBTOOL_CURRENT@:@LIBTOOL_REVISION@:@LIBTOOL_AGE@ | |
7 | ||
8 | +if ENABLE_CURSES | |
9 | +libcunit_la_LIBADD += -l$(CURSES_LIB) | |
10 | +endif | |
11 | ||
12 | if ENABLE_TEST | |
13 | noinst_LIBRARIES = libcunit_test.a | |
14 | diff -urNp -x '*.orig' CUnit-2.1-3.org/CUnit/Sources/Test/Makefile.am CUnit-2.1-3/CUnit/Sources/Test/Makefile.am | |
15 | --- CUnit-2.1-3.org/CUnit/Sources/Test/Makefile.am 2014-04-24 02:54:45.000000000 +0200 | |
16 | +++ CUnit-2.1-3/CUnit/Sources/Test/Makefile.am 2023-07-23 15:06:33.698436512 +0200 | |
17 | @@ -6,8 +6,7 @@ testdir=${datadir}/@PACKAGE@/Test | |
18 | ||
19 | test_PROGRAMS = test_cunit | |
20 | test_cunit_SOURCES = test_cunit.c | |
21 | -test_cunit_LDADD = ../libcunit_test.a | |
22 | -test_cunit_LDFLAGS = -L.. | |
23 | +test_cunit_LDADD = $(top_builddir)/CUnit/Sources/libcunit_test.a | |
24 | ||
25 | INCLUDES = -DMEMTRACE -DCUNIT_BUILD_TESTS -DCUNIT_DO_NOT_DEFINE_UNLESS_BUILDING_TESTS | |
26 | endif | |
27 | diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/AutomatedTest/Makefile.am CUnit-2.1-3/Examples/AutomatedTest/Makefile.am | |
28 | --- CUnit-2.1-3.org/Examples/AutomatedTest/Makefile.am 2014-04-24 02:54:45.000000000 +0200 | |
29 | +++ CUnit-2.1-3/Examples/AutomatedTest/Makefile.am 2023-07-23 15:06:33.698436512 +0200 | |
bab9183b | 30 | @@ -8,8 +8,8 @@ if ENABLE_AUTOMATED |
854ef19a ER |
31 | example_PROGRAMS = AutomatedTest |
32 | ||
bab9183b | 33 | AutomatedTest_SOURCES = AutomatedTest.c |
854ef19a | 34 | -AutomatedTest_LDADD = -lcunit -lcunitexamples |
bab9183b JB |
35 | -AutomatedTest_LDFLAGS = -L.. -lm |
36 | +AutomatedTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
37 | +AutomatedTest_LDFLAGS = -lm | |
854ef19a ER |
38 | INCLUDES = -I.. |
39 | ||
bab9183b | 40 | if ENABLE_CURSES |
82dfa258 MK |
41 | diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/BasicTest/Makefile.am CUnit-2.1-3/Examples/BasicTest/Makefile.am |
42 | --- CUnit-2.1-3.org/Examples/BasicTest/Makefile.am 2014-04-24 02:54:45.000000000 +0200 | |
43 | +++ CUnit-2.1-3/Examples/BasicTest/Makefile.am 2023-07-23 15:06:33.698436512 +0200 | |
bab9183b | 44 | @@ -8,8 +8,8 @@ if ENABLE_BASIC |
854ef19a ER |
45 | example_PROGRAMS = BasicTest |
46 | ||
bab9183b | 47 | BasicTest_SOURCES = BasicTest.c |
854ef19a | 48 | -BasicTest_LDADD = -lcunit -lcunitexamples |
bab9183b JB |
49 | -BasicTest_LDFLAGS = -L.. -lm |
50 | +BasicTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
51 | +BasicTest_LDFLAGS = -lm | |
854ef19a ER |
52 | INCLUDES = -I.. |
53 | ||
bab9183b | 54 | if ENABLE_CURSES |
82dfa258 MK |
55 | diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/ConsoleTest/Makefile.am CUnit-2.1-3/Examples/ConsoleTest/Makefile.am |
56 | --- CUnit-2.1-3.org/Examples/ConsoleTest/Makefile.am 2014-04-24 02:54:45.000000000 +0200 | |
57 | +++ CUnit-2.1-3/Examples/ConsoleTest/Makefile.am 2023-07-23 15:06:33.698436512 +0200 | |
bab9183b | 58 | @@ -8,8 +8,8 @@ if ENABLE_CONSOLE |
854ef19a ER |
59 | example_PROGRAMS = ConsoleTest |
60 | ||
bab9183b | 61 | ConsoleTest_SOURCES = ConsoleTest.c |
854ef19a | 62 | -ConsoleTest_LDADD = -lcunit -lcunitexamples |
bab9183b JB |
63 | -ConsoleTest_LDFLAGS = -L.. -lm |
64 | +ConsoleTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
65 | +ConsoleTest_LDFLAGS = -lm | |
854ef19a ER |
66 | INCLUDES = -I.. |
67 | ||
bab9183b | 68 | if ENABLE_CURSES |
82dfa258 MK |
69 | diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/CursesTest/Makefile.am CUnit-2.1-3/Examples/CursesTest/Makefile.am |
70 | --- CUnit-2.1-3.org/Examples/CursesTest/Makefile.am 2014-04-24 02:54:45.000000000 +0200 | |
71 | +++ CUnit-2.1-3/Examples/CursesTest/Makefile.am 2023-07-23 15:06:33.698436512 +0200 | |
bab9183b | 72 | @@ -8,8 +8,8 @@ if ENABLE_CURSES |
854ef19a ER |
73 | example_PROGRAMS = CursesTest |
74 | ||
bab9183b JB |
75 | CursesTest_SOURCES = CursesTest.c |
76 | -CursesTest_LDADD = -lcunit -lcunitexamples | |
77 | -CursesTest_LDFLAGS = -L.. -lm | |
78 | +CursesTest_LDADD = $(top_builddir)/CUnit/Sources/libcunit.la $(top_builddir)/Examples/libcunitexamples.a | |
79 | +CursesTest_LDFLAGS = -lm | |
854ef19a ER |
80 | INCLUDES = -I.. |
81 | ||
bab9183b | 82 | if ENABLE_CURSES |