From: Ivan Maidanski Date: Wed, 14 Sep 2011 11:06:29 +0000 (+0400) Subject: Adjust scripts after Makefile removal from package. X-Git-Tag: gc7_3alpha2~355 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72b19f2b5b202637de568119b53b11e0840c8441;p=gc Adjust scripts after Makefile removal from package. * Makefile.direct (OTHER_FILES): Remove Makefile. * Makefile.dj (OTHER_FILES): Likewise. * Makefile.direct (dist gc.tar): Do not backup old auto-generated Makefile. * Makefile.dj: Remove comment about Makefile.DLLs. * README: Update (about Makefile.direct). * doc/README.autoconf: Likewise. * doc/simple_example.html: Likewise. * doc/simple_example.html (sample): Remove outdated comment for GC_INIT. --- diff --git a/Makefile.direct b/Makefile.direct index 4bceb156..d7b77b57 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -137,7 +137,7 @@ OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE gc.mak \ NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \ build_atomic_ops.sh build_atomic_ops.sh.cygwin -OTHER_FILES= Makefile tools/setjmp_t.c tools/callprocs.sh extra/MacOS.c \ +OTHER_FILES= tools/setjmp_t.c tools/callprocs.sh extra/MacOS.c \ Mac_files/datastart.c Mac_files/dataend.c \ Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \ tools/add_gc_prefix.c gc_cpp.cpp \ @@ -411,7 +411,6 @@ gcname: $(srcdir)/tools/gcname.c $(srcdir)/include/gc_version.h #We assume this is being done from source directory. dist gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname - cp Makefile Makefile.old cp Makefile.direct Makefile cd $(AO_SRC_DIR); $(MAKE) dist if test $(srcdir)/libatomic_ops = $(AO_SRC_DIR); \ diff --git a/Makefile.dj b/Makefile.dj index eb793434..323dfa8d 100644 --- a/Makefile.dj +++ b/Makefile.dj @@ -60,7 +60,7 @@ SRCS= $(CSRCS) \ include/private/specific.h \ include/leak_detector.h $(CORD_SRCS) -OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \ +OTHER_FILES= PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \ README tests/test.c test_cpp.cc tools/setjmp_t.c SMakefile.amiga \ doc/README.amiga doc/README.win32 doc/README.cords \ doc/README.rs6000 README.QUICK TODO tools/callprocs.sh \ @@ -295,6 +295,3 @@ test_dll: test_dll.o libgc_dll.a libgc.dll $(CC) test_dll.o -L$(ABSDIR) -lgc_dll -o test_dll SYM_PREFIX-libgc=GC - -# Uncomment the following line to build a GNU win32 DLL -# include Makefile.DLLs diff --git a/README b/README index a5b39328..e9ae28b0 100644 --- a/README +++ b/README @@ -203,7 +203,7 @@ contrived program "test.c" than for your application.) On most Un*x-like platforms, the collector can be built either using a GNU autoconf-based build infrastructure (type "configure; make" in the simplest case), or with a classic makefile by itself (type -"cp Makefile.direct Makefile; make"). Here we focus on the latter option. +"make -f Makefile.direct"). Here we focus on the latter option. On other platforms, typically only the latter option is available, though with a different supplied Makefile.) @@ -405,7 +405,7 @@ USE AS LEAK DETECTOR: The collector may be used to track down leaks in C programs that are intended to run with malloc/free (e.g. code with extreme real-time or -portability constraints). To do so define FIND_LEAK in Makefile +portability constraints). To do so define FIND_LEAK in Makefile. This will cause the collector to invoke the report_leak routine defined near the top of reclaim.c whenever an inaccessible object is found that has not been explicitly freed. Such objects will diff --git a/doc/README.autoconf b/doc/README.autoconf index 94833f65..e8928731 100644 --- a/doc/README.autoconf +++ b/doc/README.autoconf @@ -35,9 +35,9 @@ The distribution should contain all files needed to run "configure" and "make", as well as the sources needed to regenerate the derived files. (If I missed some, please let me know.) -Note that the distribution comes with a "Makefile" which will be overwritten -by "configure" with one that is not at all equivalent to the original. The -distribution contains a copy of the original "Makefile" in "Makefile.direct". +Note that the distribution comes without "Makefile" which is generated by +"configure". The distribution also contains "Makefile.direct" which is not +always equivalent to the generated one. Important options to configure: diff --git a/doc/simple_example.html b/doc/simple_example.html index fefe7a98..95e49a6b 100644 --- a/doc/simple_example.html +++ b/doc/simple_example.html @@ -33,8 +33,7 @@ It runs a basic correctness test which usually takes well under a minute. On non-Unix, non-Linux platforms, the collector is usually built by copying the appropriate makefile (see the platform-specific README in doc/README.xxx -in the distribution) to the file "Makefile" (overwriting the copy of -Makefile.direct that was originally there), and then typing "make" +in the distribution) to the file "Makefile", and then typing "make" (or "nmake" or ...). This builds the library in the source tree. You may want to move it and the files in the include directory to a more convenient place. @@ -104,7 +103,7 @@ int main() { int i; - GC_INIT(); /* Optional on Linux/X86; see below. */ + GC_INIT(); for (i = 0; i < 10000000; ++i) { int **p = (int **) GC_MALLOC(sizeof(int *));