65 lines
2.5 KiB
Diff
65 lines
2.5 KiB
Diff
--- gc6.5/Makefile.in.opendl 2005-05-16 18:28:28.000000000 -0500
|
|
+++ gc6.5/Makefile.in 2005-05-25 10:27:00.341398988 -0500
|
|
@@ -336,7 +336,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
|
|
EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
|
|
@@ -345,7 +345,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
|
|
AM_CXXFLAGS = @GC_CFLAGS@
|
|
AM_CFLAGS = @GC_CFLAGS@
|
|
@@ -354,9 +354,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)
|
|
all_objs = @addobjs@ $(libgc_la_OBJECTS)
|
|
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
|
|
--- gc6.5/Makefile.am.opendl 2005-05-16 17:11:08.000000000 -0500
|
|
+++ gc6.5/Makefile.am 2005-05-25 10:25:35.953868785 -0500
|
|
@@ -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)
|
|
|