65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
--- gc6.4/Makefile.am.opendl 2004-12-16 18:27:52.000000000 -0600
|
|
+++ gc6.4/Makefile.am 2005-01-10 09:58:12.000000000 -0600
|
|
@@ -55,7 +55,7 @@
|
|
|
|
# Include THREADDLLIBS here to ensure that the correct versions of
|
|
# linuxthread semaphore functions get linked:
|
|
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
|
|
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
libgc_la_DEPENDENCIES = @addobjs@
|
|
libgc_la_LDFLAGS = -version-info 1:2:0
|
|
|
|
@@ -65,7 +65,7 @@
|
|
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
|
|
|
|
libgccpp_la_SOURCES = gc_cpp.cc
|
|
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
|
|
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
libgccpp_la_LDFLAGS = -version-info 1:2:0
|
|
|
|
EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
|
|
@@ -91,9 +91,9 @@
|
|
## are included in the distribution
|
|
# gctest_OBJECTS = test.o
|
|
gctest_SOURCES = tests/test.c
|
|
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
+gctest_LDADD = ./libgc.la
|
|
test_cpp_SOURCES = tests/test_cpp.cc
|
|
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
|
|
|
|
TESTS = gctest $(extra_checks)
|
|
|
|
--- gc6.4/Makefile.in.opendl 2004-12-20 20:00:44.000000000 -0600
|
|
+++ gc6.4/Makefile.in 2005-01-10 09:59:11.000000000 -0600
|
|
@@ -188,7 +188,7 @@
|
|
|
|
# Include THREADDLLIBS here to ensure that the correct versions of
|
|
# linuxthread semaphore functions get linked:
|
|
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
|
|
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
libgc_la_DEPENDENCIES = @addobjs@
|
|
libgc_la_LDFLAGS = -version-info 1:2:0
|
|
|
|
@@ -199,7 +199,7 @@
|
|
|
|
|
|
libgccpp_la_SOURCES = gc_cpp.cc
|
|
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
|
|
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
libgccpp_la_LDFLAGS = -version-info 1:2:0
|
|
|
|
AM_CXXFLAGS = @GC_CFLAGS@
|
|
@@ -212,9 +212,9 @@
|
|
|
|
# gctest_OBJECTS = test.o
|
|
gctest_SOURCES = tests/test.c
|
|
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
+gctest_LDADD = ./libgc.la
|
|
test_cpp_SOURCES = tests/test_cpp.cc
|
|
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
|
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
|
|
|
|
TESTS = gctest $(extra_checks)
|
|
|