--- gc-7.1/Makefile.am.old 2009-02-16 10:58:23.780324000 +0800
+++ gc-7.1/Makefile.am 2009-02-16 11:01:06.462471000 +0800
@@ -55,8 +55,8 @@ pkgconfig_DATA = bdw-gc.pc
# C Library
# ---------
-lib_LTLIBRARIES += libgc.la
-libgc_la_SOURCES = \
+lib_LTLIBRARIES += libbgc.la
+libbgc_la_SOURCES = \
allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
@@ -68,32 +68,32 @@ libgc_la_SOURCES = \
# ---------------------------------
if PTHREADS
-libgc_la_SOURCES += pthread_start.c pthread_support.c pthread_stop_world.c
+libbgc_la_SOURCES += pthread_start.c pthread_support.c pthread_stop_world.c
endif
if DARWIN_THREADS
-libgc_la_SOURCES += darwin_stop_world.c
+libbgc_la_SOURCES += darwin_stop_world.c
endif
if WIN32_THREADS
-libgc_la_SOURCES += win32_threads.c
+libbgc_la_SOURCES += win32_threads.c
endif
if USE_INTERNAL_LIBATOMIC_OPS
-nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
+nodist_libbgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
endif
if NEED_ATOMIC_OPS_ASM
-nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
+nodist_libbgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
endif
# Include THREADDLLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
-libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
+libbgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
+libbgc_la_DEPENDENCIES = @addobjs@
+libbgc_la_LDFLAGS = $(extra_ldflags_libbgc) -version-info 1:3:0 -no-undefined
-EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
+EXTRA_libbgc_la_SOURCES = alpha_mach_dep.S \
mips_sgi_mach_dep.s mips_ultrix_mach_dep.s \
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
@@ -103,11 +103,11 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep.
# -------------
if CPLUSPLUS
-lib_LTLIBRARIES += libgccpp.la
+lib_LTLIBRARIES += libbgccpp.la
pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
-libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = ./libgc.la
-libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
+libbgccpp_la_SOURCES = gc_cpp.cc
+libbgccpp_la_LIBADD = ./libbgc.la
+libbgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
endif
# FIXME: If Visual C++ users use Makefile.am, this should go into
@@ -124,7 +124,7 @@ AM_CFLAGS = @GC_CFLAGS@
## FIXME: relies on internal code generated by automake.
## FIXME: ./configure --enable-dependency-tracking should be used
-#all_objs = @addobjs@ $(libgc_la_OBJECTS)
+#all_objs = @addobjs@ $(libbgc_la_OBJECTS)
#$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
#include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
#include/gc_pthread_redirects.h include/gc_config_macros.h \
@@ -204,5 +204,5 @@ include include/include.am
include cord/cord.am
include tests/tests.am
include doc/doc.am
-# Putting these at the top causes cord to be built first, and not find libgc.a
+# Putting these at the top causes cord to be built first, and not find libbgc.a
# on HP/UX. There may be a better fix.
--- gc-7.1/configure.ac.old Mon Feb 16 11:03:39 2009
+++ gc-7.1/configure.ac Mon Feb 16 11:16:34 2009
@@ -312,14 +312,14 @@
# extra LD Flags which are required for targets
case "${host}" in
*-*-darwin*)
- extra_ldflags_libgc=-Wl,-single_module
+ extra_ldflags_libbgc=-Wl,-single_module
;;
esac
-AC_SUBST(extra_ldflags_libgc)
+AC_SUBST(extra_ldflags_libbgc)
AC_SUBST(EXTRA_TEST_LIBS)
-target_all=libgc.la
+target_all=libbgc.la
AC_SUBST(target_all)
dnl If the target is an eCos system, use the appropriate eCos
--- gc-7.1/cord/cord.am.old 2009-02-16 13:24:33.828848000 +0800
+++ gc-7.1/cord/cord.am 2009-02-16 13:24:51.101815000 +0800
@@ -1,7 +1,7 @@
lib_LTLIBRARIES += libcord.la
-libcord_la_LIBADD = $(top_builddir)/libgc.la
+libcord_la_LIBADD = $(top_builddir)/libbgc.la
libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined
libcord_la_SOURCES = \
--- gc-7.1/bdw-gc.pc.in.old Mon Feb 16 14:03:53 2009
+++ gc-7.1/bdw-gc.pc.in Mon Feb 16 14:04:11 2009
@@ -6,5 +6,5 @@
Name: Boehm-Demers-Weiser Conservative Garbage Collector
Description: A garbage collector for C and C++
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lgc
+Libs: -L${libdir} -lbgc
Cflags: -I${includedir}