From 2ec512139502dd631518db89536a48d465681383 Mon Sep 17 00:00:00 2001 From: hboehm Date: Mon, 20 Oct 2008 23:11:27 +0000 Subject: [PATCH] 2008-10-20 Hans Boehm * doc/README: Make it clearer when Makefile.direct is assumed. * cord/cord.am: install include/cord.h. * Makefile.in: Regenerate. --- ChangeLog | 5 +++++ Makefile.in | 4 ++-- cord/cord.am | 2 ++ doc/README | 33 ++++++++++++++++++--------------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3e43bfa..0e5fd419 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-20 Hans Boehm + * doc/README: Make it clearer when Makefile.direct is assumed. + * cord/cord.am: install include/cord.h. + * Makefile.in: Regenerate. + 2008-09-24 Hans Boehm (Really Ivan Maidanski) * win32_threads.c (GC_pthread_join, GC_pthread_start_inner): Remove unused variables. diff --git a/Makefile.in b/Makefile.in index 1fd6164e..b0e38392 100644 --- a/Makefile.in +++ b/Makefile.in @@ -261,7 +261,7 @@ am__pkginclude_HEADERS_DIST = include/gc_cpp.h include/gc_allocator.h \ include/gc_backptr.h include/gc_gcj.h include/leak_detector.h \ include/gc_amiga_redirects.h include/gc_pthread_redirects.h \ include/gc_config_macros.h include/gc_tiny_fl.h \ - include/gc_version.h + include/gc_version.h include/cord.h pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(dist_noinst_HEADERS) $(include_HEADERS) \ $(pkginclude_HEADERS) @@ -492,7 +492,7 @@ pkginclude_HEADERS = $(am__append_5) include/gc.h include/gc_typed.h \ include/gc_allocator.h include/gc_backptr.h include/gc_gcj.h \ include/leak_detector.h include/gc_amiga_redirects.h \ include/gc_pthread_redirects.h include/gc_config_macros.h \ - include/gc_tiny_fl.h include/gc_version.h + include/gc_tiny_fl.h include/gc_version.h include/cord.h # headers which are not installed # diff --git a/cord/cord.am b/cord/cord.am index fc5e8cc2..f6a3982d 100644 --- a/cord/cord.am +++ b/cord/cord.am @@ -15,3 +15,5 @@ EXTRA_DIST += \ cord/cordbscs.c cord/cordtest.c cord/de.c \ cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h \ cord/de_win.h cord/de_win.c cord/de_win.RC cord/de_win.ICO + +pkginclude_HEADERS += include/cord.h diff --git a/doc/README b/doc/README index b7bbfe6f..a4f63799 100644 --- a/doc/README +++ b/doc/README @@ -207,21 +207,24 @@ simplest case), or with a classic makefile by itself (type On other platforms, typically only the latter option is available, though with a different supplied Makefile.) - Typing "make test" nstead of "make" will automatically build the collector -and then run setjmp_test and gctest. Setjmp_test will give you information -about configuring the collector, which is useful primarily if you have -a machine that's not already supported. Gctest is a somewhat superficial -test of collector functionality. Failure is indicated by a core dump or -a message to the effect that the collector is broken. Gctest takes about -a second to two to run on reasonable 2007 vintage desktops. -It may use up to about 30MB of memory. (The -multi-threaded version will use more. 64-bit versions may use more.) -"Make test" will also, as its last step, attempt to build and test the -"cord" string library.) - - The Makefile will generate a library gc.a which you should link against. -Typing "make cords" will add the cord library to gc.a. -Note that this requires an ANSI C compiler. + For the Makefile.direct-based process, typing "make test" instead of "make" +will automatically build the collector and then run setjmp_test and gctest. +Setjmp_test will give you information about configuring the collector, which is +useful primarily if you have a machine that's not already supported. Gctest is +a somewhat superficial test of collector functionality. Failure is indicated +by a core dump or a message to the effect that the collector is broken. Gctest +takes about a second to two to run on reasonable 2007 vintage desktops. It may +use up to about 30MB of memory. (The multi-threaded version will use more. +64-bit versions may use more.) "Make test" will also, as its last step, attempt +to build and test the "cord" string library.) + + Makefile.direct will generate a library gc.a which you should link against. +Typing "make cords" will add the cord library to gc.a. + + The GNU style build process understands the usual targets. "Make check" +runs a number of tests. "Make install" installs at least libgc, and libcord. +Try "./configure --help" to see the configuration options. It is currently +not possible to exercise all combinations of build options this way. It is suggested that if you need to replace a piece of the collector (e.g. GC_mark_rts.c) you simply list your version ahead of gc.a on the -- 2.49.0