From b9942968259e39bc9ce1cfafc1c9c59169306d95 Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Tue, 17 Jun 2008 12:57:40 +0200 Subject: [PATCH] * src/mm/boehm-gc/Makefile.am (DISTCLEANFILES): Added. * src/mm/boehm-gc/libatomic_ops-1.2/doc/Makefile.am: Don't install files. * src/mm/boehm-gc/libatomic_ops-1.2/src/Makefile.am, src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/Makefile.am, src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am: Likewise. * src/mm/boehm-gc/libatomic_ops-1.2/tests/test_atomic_include.h: Something changed. * src/mm/boehm-gc/libatomic_ops-1.2/mkinstalldirs: Removed. --- src/mm/boehm-gc/Makefile.am | 7 +- .../libatomic_ops-1.2/doc/Makefile.am | 3 +- .../boehm-gc/libatomic_ops-1.2/mkinstalldirs | 158 ------------------ .../libatomic_ops-1.2/src/Makefile.am | 6 +- .../src/atomic_ops/Makefile.am | 3 +- .../src/atomic_ops/sysdeps/Makefile.am | 3 +- .../tests/test_atomic_include.h | 9 - 7 files changed, 16 insertions(+), 173 deletions(-) delete mode 100755 src/mm/boehm-gc/libatomic_ops-1.2/mkinstalldirs diff --git a/src/mm/boehm-gc/Makefile.am b/src/mm/boehm-gc/Makefile.am index 67b3f4a79..14091f125 100644 --- a/src/mm/boehm-gc/Makefile.am +++ b/src/mm/boehm-gc/Makefile.am @@ -16,6 +16,11 @@ ## Process this file with automake to produce Makefile.in. +DISTCLEANFILES = \ + atomic_ops.c \ + atomic_ops_sysdeps.S \ + libatomic_ops + ## FIXME: `make distcheck' in this directory will not currently work. ## This is most likely to the explicit flags passed to submakes. @@ -76,7 +81,7 @@ endif if USE_INTERNAL_LIBATOMIC_OPS nodist_libgc_la_SOURCES = ./atomic_ops.c endif - + if NEED_ATOMIC_OPS_ASM nodist_libgc_la_SOURCES = ./atomic_ops_sysdeps.S endif diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/doc/Makefile.am b/src/mm/boehm-gc/libatomic_ops-1.2/doc/Makefile.am index ce212d08a..09756e71c 100644 --- a/src/mm/boehm-gc/libatomic_ops-1.2/doc/Makefile.am +++ b/src/mm/boehm-gc/libatomic_ops-1.2/doc/Makefile.am @@ -1,3 +1,4 @@ # installed documentation # -dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt +#dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt +dist_noinst_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/mkinstalldirs b/src/mm/boehm-gc/libatomic_ops-1.2/mkinstalldirs deleted file mode 100755 index 259dbfcd3..000000000 --- a/src/mm/boehm-gc/libatomic_ops-1.2/mkinstalldirs +++ /dev/null @@ -1,158 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2005-06-29.22 - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/src/Makefile.am b/src/mm/boehm-gc/libatomic_ops-1.2/src/Makefile.am index 7ca41ff11..be1adf9fe 100644 --- a/src/mm/boehm-gc/libatomic_ops-1.2/src/Makefile.am +++ b/src/mm/boehm-gc/libatomic_ops-1.2/src/Makefile.am @@ -2,8 +2,10 @@ SUBDIRS=atomic_ops AM_CFLAGS=@PICFLAG@ -include_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h -lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a +#include_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h +noinst_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h +#lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a +noinst_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a if NEED_ASM libatomic_ops_a_SOURCES = atomic_ops.c atomic_ops_sysdeps.S else diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/Makefile.am b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/Makefile.am index 8000273f2..67148e79e 100644 --- a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/Makefile.am +++ b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/Makefile.am @@ -3,7 +3,8 @@ SUBDIRS=sysdeps EXTRA_DIST=generalize-small.template #Private Headers -private_HEADERS=generalize.h generalize-small.h +#private_HEADERS=generalize.h generalize-small.h +noinst_HEADERS=generalize.h generalize-small.h privatedir=${includedir}/atomic_ops/ generalize-small.h: generalize-small.template diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am index f47f8120c..ceed063ef 100644 --- a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am +++ b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am @@ -1,5 +1,6 @@ #General sysdep utility headers, followed by the arch-specific ones -nobase_sysdep_HEADERS= generic_pthread.h \ +#nobase_sysdep_HEADERS= generic_pthread.h \ +noinst_HEADERS= generic_pthread.h \ atomic_load_store.h \ aligned_atomic_load_store.h \ acquire_release_volatile.h \ diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/tests/test_atomic_include.h b/src/mm/boehm-gc/libatomic_ops-1.2/tests/test_atomic_include.h index bc280ebd2..c9970ab36 100644 --- a/src/mm/boehm-gc/libatomic_ops-1.2/tests/test_atomic_include.h +++ b/src/mm/boehm-gc/libatomic_ops-1.2/tests/test_atomic_include.h @@ -5,15 +5,6 @@ * see doc/COPYING for details. */ -void test_atomic(void); -void test_atomic_release(void); -void test_atomic_acquire(void); -void test_atomic_read(void); -void test_atomic_write(void); -void test_atomic_full(void); -void test_atomic_release_write(void); -void test_atomic_acquire_read(void); - /* Some basic sanity tests. These do not test the barrier semantics. */ #undef TA_assert -- 2.25.1