From dca8562362e83350ac6903cc1cd8193426d4bdbd Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 12 May 2017 17:55:57 +0300 Subject: [PATCH] Remove 'dist' target from Makefile.direct Distribution tarballs are now created using autotools-based Makefile. * Makefile.am (EXTRA_DIST): Remove tools/add_gc_prefix.c, tools/gcname.c items. * Makefile.direct (SRCS): Likewise. * Makefile.direct (DOC_FILES, TESTS, GNU_BUILD_FILES, OTHER_MAKEFILES, OTHER_FILES): Remove variable. * Makefile.direct (add_gc_prefix, gcname, dist, gc.tar, gc.tar.Z, gc.tar.gz): Remove target. * tools/add_gc_prefix.c: Remove. * tools/gcname.c: Likewise. --- Makefile.am | 5 ++-- Makefile.direct | 63 ++----------------------------------------- tools/add_gc_prefix.c | 13 --------- tools/gcname.c | 9 ------- 4 files changed, 4 insertions(+), 86 deletions(-) delete mode 100644 tools/add_gc_prefix.c delete mode 100644 tools/gcname.c diff --git a/Makefile.am b/Makefile.am index 3b427283..a28b0428 100644 --- a/Makefile.am +++ b/Makefile.am @@ -186,9 +186,8 @@ EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \ # files used by makefiles other than Makefile.am # -EXTRA_DIST += tools/add_gc_prefix.c tools/gcname.c tools/if_mach.c \ - tools/if_not_there.c tools/setjmp_t.c tools/threadlibs.c \ - gc.mak extra/MacOS.c extra/AmigaOS.c \ +EXTRA_DIST += tools/if_mach.c tools/if_not_there.c tools/setjmp_t.c \ + tools/threadlibs.c gc.mak extra/MacOS.c extra/AmigaOS.c \ extra/symbian/global_end.cpp extra/symbian/global_start.cpp \ extra/symbian/init_global_static_roots.cpp extra/symbian.cpp \ build/s60v3/bld.inf build/s60v3/libgc.mmp \ diff --git a/Makefile.direct b/Makefile.direct index f1ba11f2..579b888b 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -111,9 +111,8 @@ SRCS= $(CSRCS) \ include/gc_version.h include/private/gc_hdrs.h include/private/gc_priv.h \ include/private/gcconfig.h include/private/gc_pmark.h \ include/gc_inline.h include/gc_mark.h include/gc_disclaim.h \ - tools/threadlibs.c \ - tools/if_mach.c tools/if_not_there.c gc_cpp.cc include/gc_cpp.h \ - tools/gcname.c include/weakpointer.h include/private/gc_locks.h \ + tools/threadlibs.c tools/if_mach.c tools/if_not_there.c gc_cpp.cc \ + include/gc_cpp.h include/weakpointer.h include/private/gc_locks.h \ include/new_gc_alloc.h include/gc_allocator.h \ include/javaxfc.h \ include/gc_backptr.h include/gc_gcj.h include/private/dbg_mlc.h \ @@ -125,42 +124,6 @@ SRCS= $(CSRCS) \ ia64_save_regs_in_stack.s sparc_mach_dep.S \ sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s $(CORD_SRCS) -DOC_FILES= doc/README.Mac doc/README.OS2 \ - doc/README.amiga doc/README.cords doc/debugging.html \ - doc/finalization.html doc/porting.html doc/overview.html \ - doc/README.hp doc/README.linux doc/README.rs6000 \ - doc/README.sgi doc/README.solaris2 doc/README.uts \ - doc/README.symbian doc/README.win32 README.md AUTHORS doc/gc.man \ - doc/README.environment doc/tree.html doc/gcdescr.html \ - doc/README.autoconf doc/README.macros doc/README.ews4800 \ - doc/README.DGUX386 doc/README.arm.cross doc/leak.html \ - doc/scale.html doc/gcinterface.html doc/README.darwin \ - doc/simple_example.html doc/README.win64 - -TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \ - tests/leak_test.c tests/thread_leak_test.c tests/middle.c \ - tests/smash_test.c tests/huge_test.c - -GNU_BUILD_FILES= configure.ac Makefile.am configure install-sh Makefile.in \ - aclocal.m4 config.sub config.guess \ - include/include.am doc/doc.am \ - ltmain.sh mkinstalldirs depcomp missing \ - cord/cord.am tests/tests.am autogen.sh \ - bdw-gc.pc.in compile - -OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE gc.mak \ - BCC_MAKEFILE WCC_MAKEFILE PCR-Makefile SMakefile.amiga \ - digimars.mak Makefile.direct - -OTHER_FILES= README.QUICK tools/setjmp_t.c tools/callprocs.sh \ - extra/MacOS.c extra/Mac_files/datastart.c extra/Mac_files/dataend.c \ - extra/Mac_files/MacOS_config.h tools/add_gc_prefix.c gc_cpp.cpp \ - extra/symbian/global_end.cpp extra/symbian/global_start.cpp \ - extra/symbian/init_global_static_roots.cpp extra/symbian.cpp \ - build/s60v3/bld.inf build/s60v3/libgc.mmp \ - extra/AmigaOS.c extra/msvc_dbg.c include/private/msvc_dbg.h \ - $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES) - CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \ $(srcdir)/include/ec.h $(srcdir)/include/cord_pos.h @@ -433,28 +396,6 @@ check: cord/cordtest$(EXEEXT) gctest$(EXEEXT) setjmp_test$(EXEEXT) # A synonym to "check" (for compatibility with older GC versions). test: check -add_gc_prefix: $(srcdir)/tools/add_gc_prefix.c $(srcdir)/include/gc_version.h - $(CC) -o add_gc_prefix $(srcdir)/tools/add_gc_prefix.c - -gcname: $(srcdir)/tools/gcname.c $(srcdir)/include/gc_version.h - $(CC) -o gcname $(srcdir)/tools/gcname.c - -# We assume this is being done from source directory. -dist gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname - rm -f `./gcname` - ln -s . `./gcname` - ./add_gc_prefix $(SRCS) $(DOC_FILES) $(OTHER_FILES) > /tmp/gc.tar-files - tar cvfh gc.tar `cat /tmp/gc.tar-files` - cp gc.tar `./gcname`.tar - gzip `./gcname`.tar - rm `./gcname` - -gc.tar.Z: gc.tar - compress gc.tar - -gc.tar.gz: gc.tar - gzip gc.tar - # BTL: added to test shared library version of collector. # Currently works only under SunOS5. Requires GC_INIT call from statically # loaded client code. diff --git a/tools/add_gc_prefix.c b/tools/add_gc_prefix.c deleted file mode 100644 index 60afa5ff..00000000 --- a/tools/add_gc_prefix.c +++ /dev/null @@ -1,13 +0,0 @@ -# include -# include - -int main(int argc, char ** argv) -{ - int i; - - for (i = 1; i < argc; i++) { - printf("gc-%d.%d.%d/%s ", - GC_VERSION_MAJOR, GC_VERSION_MINOR, GC_VERSION_MICRO, argv[i]); - } - return(0); -} diff --git a/tools/gcname.c b/tools/gcname.c deleted file mode 100644 index b9f33641..00000000 --- a/tools/gcname.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include - -int main(void) -{ - printf("gc-%d.%d.%d", - GC_VERSION_MAJOR, GC_VERSION_MINOR, GC_VERSION_MICRO); - return 0; -} -- 2.40.0