make distcheck fixes

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@983 0c269be4-1314-0410-8aa9-9f06e86f4224

config/Makefile.am

@@ -1,9 +1,7 @@
-# Currently, we don't actually build anything in the `cpu' and `os'
-# subdirectories.  If we ever do, they will need Makefiles.  For now,
-# this is sufficient.  Unfortunately, their CVS subdirectories also
-# get distributed as a side-effect.
+# We don't actually build anything in the `cpu' and `os'
+# subdirectories.
 
-EXTRA_DIST = configure.host depcomp cpu os sysdeps
+DIST_SUBDIRS = cpu os sysdeps
+EXTRA_DIST = depcomp
 MAINTAINERCLEANFILES = Makefile.in config.guess config.sub \
                        install-sh ltmain.sh missing mkinstalldirs 
-

config/configure.host

@@ -1,171 +0,0 @@
-########################################################################
-#
-# configure.host -- JACK Audio Connection Kit version.
-#
-# This script and the system-dependent header directories it uses were
-# adapted for JACK from gcc/libstdc++-v3/configure.host.
-#
-# We've tried to keep it as close to the original as possible, while
-# removing a bunch of os-specific files that didn't seem relevant.
-# The primary goal has been to avoid changing the cpu-dependent
-# atomicity.h headers.
-#
-# If you need to make changes, the relevant GCC documentation may
-# prove helpful, <http://gcc.gnu.org/onlinedocs/porting>, especially
-# the <http://gcc.gnu.org/onlinedocs/porting/Thread-safety.html>
-# discussion of <atomicity.h>.
-#
-########################################################################
-
-# This shell script handles all host based configuration for libstdc++.
-# It sets various shell variables based on the the host and the
-# configuration options.  You can modify this shell script without needing
-# to rerun autoconf/aclocal/etc.  This file is "sourced" not executed.
-#
-# You should read docs/html/17_intro/porting.* to make sense of this file.
-#
-#
-# It uses the following shell variables as set by config.guess:
-#   host                The configuration host (full CPU-vendor-OS triplet)
-#   host_cpu            The configuration host CPU
-#   host_os             The configuration host OS
-#
-#
-# It sets the following shell variables:
-#
-#   cpu_include_dir        CPU-specific directory, defaults to cpu/generic
-#                          if cpu/host_cpu doesn't exist.  This is
-#                          used to set atomicity_include_dir.
-#
-#   os_include_dir         OS-specific directory, defaults to os/generic.
-#
-#   atomicity_include_dir  location of atomicity.h,
-#                          defaults to cpu_include_dir
-#
-# It possibly modifies the following variables:
-#
-#   OS_LDFLAGS             extra flags to pass when linking the library, of
-#                          the form '-Wl,blah'
-#                          (defaults to empty in acinclude.m4)
-#
-# If the defaults will not work for your platform, you need only change the
-# variables that won't work, i.e., you do not need to explicitly set a
-# working variable to its default.  Most hosts only need to change the two
-# *_include_dir variables.
-
-
-# DEFAULTS
-# Try to guess a default cpu_include_dir based on the name of the CPU.  We
-# cannot do this for os_include_dir; there are too many portable operating
-# systems out there.  :-)
-
-# HOST-SPECIFIC OVERRIDES
-# Set any CPU-dependent bits.
-# Here we override defaults and catch more general cases due to naming
-# conventions (e.g., chip_name* to catch all variants).
-
-# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
-case "${host_cpu}" in
-  alpha*)
-    try_cpu=alpha
-    ;;
-  i[3567]86 | x86_64 | amd64)
-    # Note that this causes us to compile i386 using i486
-    # instructions.  This is done for binary distributions, which
-    # typically compile for i386 as the lowest common denominator.
-    # Since JACK is unlikely to actually be used on a real i386, we
-    # substitute i486 as our common denominator.  That way the atomic
-    # instructions work properly.
-    try_cpu=i486
-    ;;
-  hppa*)
-    try_cpu=hppa
-    ;;
-  mips*)
-    # NB: cpu/mips/atomicity.h needs MIPS II or above.  
-    # Of course, there is no sane way to test for this, no ABI macro,
-    # and no consistent host_cpu name differentiation. Therefore, only
-    # use it where it is known to be safe, ie it runs linux (see below).
-    try_cpu=generic
-    ;;
-  m680[246]0)
-    try_cpu=m68k
-    ;;
-  powerpc* | rs6000)
-    try_cpu=powerpc
-    ;;
-  s390x)
-    try_cpu=s390
-    ;;
-  sparc* | ultrasparc)
-    try_cpu=sparc
-    ;;
-  *)
-    if test -d $srcdir/config/cpu/${host_cpu}; then
-      try_cpu=${host_cpu}
-    else
-      try_cpu=generic
-    fi
-    ;;
-esac
-
-# set the CPU that will be used to select atomicity functionality
-ATOMICITY_TARGET=${try_cpu}
-
-# Set any OS-dependent bits.
-# Set the os_include_dir.
-# If atomic ops and/or numeric limits are OS-specific rather than
-# CPU-specifc, set those here too.
-# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
-case "${host_os}" in
-  aix4.[3456789]* | aix[56789]*)
-    # We set os_include_dir to os/aix only on AIX 4.3 and newer, but
-    # os/aix/atomicity.h works on earlier versions of AIX 4.*, so we
-    # explicitly duplicate the directory for 4.[<3].
-    OSPLATFORM="AIX"
-    ATOMICITY_TARGET="AIX"
-    OS_LDFLAGS="-Wl,-G"
-    ;;
-  aix4.*)
-    OSPLATFORM="GENERIC"
-    ATOMICITY_TARGET="AIX"
-    ;;
-  aix*)
-    OSPLATFORM="GENERIC"
-    ATOMICITY_TARGET="GENERIC"
-    ;;
-  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-    OSPLATFORM="GNULINUX"
-    ;;
-  freebsd*)
-    # current FreeBSD header files conflict with the OSS driver's
-    # barrier code, this may be fixed in 5.3, stay tuned.
-    OSPLATFORM="GENERIC"
-    USE_BARRIER="no"
-    ;;
-  irix*)
-    OSPLATFORM="IRIX"
-    ATOMICITY_TARGET="IRIX"
-    ;;
-  darwin*)
-    OSPLATFORM="MACOSX"    
-    JACK_THREAD_STACK_TOUCH=10000	# need small realtime stack
-    JACK_CPP_VARARGS_BROKEN=1
-    JACK_DO_NOT_MLOCK=1
-    JACK_USE_MACH_THREADS=1
-    OS_LDFLAGS="-framework CoreAudio -framework CoreServices -framework AudioUnit"
-    TRY_POSIX_SHM=yes			# POSIX shm works better
-    ;;
-  *)
-    OSPLATFORM="GENERIC"
-    ;;
-esac
-
-
-# Set any OS-dependent and CPU-dependent bits.
-# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
-case "${host}" in
-  mips*-*-linux*)
-    atomicity_include_dir="cpu/mips"
-    ;;
-esac

config/cpu/Makefile.am

@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+DIST_SUBDIRS = alpha cris generic i386 i486 ia64 m68k mips powerpc s390

config/cpu/alpha/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h cycles.h
+

config/cpu/cris/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h
+

config/cpu/generic/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h cycles.h
+

config/cpu/i386/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h cycles.h
+

config/cpu/i486/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = cycles.h
+

config/cpu/ia64/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h cycles.h ia64intrin.h
+

config/cpu/m68k/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h
+

config/cpu/mips/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h
+

config/cpu/powerpc/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h cycles.h
+

config/cpu/s390/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = atomicity.h
+

config/os/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+DIST_SUBDIRS = generic gnu-linux macosx
+

config/os/aix/atomicity.h

@@ -1,59 +0,0 @@
-// Low-level functions for atomic operations: AIX version  -*- C++ -*-
-
-// Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H       1
-
-/* We cannot use the cpu/powerpc/bits/atomicity.h inline assembly
-   definitions for these operations since they depend on operations
-   that are not available on the original POWER architecture.  AIX
-   still runs on the POWER architecture, so it would be incorrect to
-   assume the existence of these instructions.  */
-
-/* This should match the type pointed to by atomic_p in
-   <sys/atomic_op.h>.  */
-typedef int _Atomic_word;
-
-#include <sys/atomic_op.h>
-
-static inline int
-__attribute__ ((__unused__))
-__exchange_and_add (atomic_p __mem, int __val)
-{
-  return fetch_and_add (__mem, __val);
-}
-
-static inline void
-__attribute__ ((__unused__))
-__atomic_add (atomic_p __mem, int __val)
-{
-  (void) fetch_and_add (__mem, __val);
-}
-
-#endif /* atomicity.h */

config/os/generic/Makefile.am

@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = ipc.h poll.h time.c time.h

config/os/gnu-linux/Makefile.am

@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = time.c time.h

config/os/irix/atomicity.h

@@ -1,50 +0,0 @@
-// Low-level functions for atomic operations: IRIX version  -*- C++ -*-
-
-// Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
-
-#include <mutex.h>
-
-typedef long _Atomic_word;
-
-static inline _Atomic_word
-__exchange_and_add (_Atomic_word* __mem, int __val)
-{
-  return (_Atomic_word) test_then_add ((unsigned long*) __mem, __val);
-}
-
-
-static inline void
-__atomic_add (_Atomic_word* __mem, int __val)
-{
-  __exchange_and_add (__mem, __val);
-}
-
-#endif /* atomicity.h */

config/os/macosx/Makefile.am

@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = getopt.h ipc.h JACK_LOCATION.h jack.xcode mach_port.h \
+	poll.h pThreadUtilities.h time.c time.h

config/sysdeps/Makefile.am

@@ -0,0 +1,13 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_HEADERS =		\
+	atomicity.h		\
+	cycles.h		\
+	getopt.h		\
+	ipc.h			\
+	mach_port.h		\
+	pThreadUtilities.h	\
+	poll.h			\
+	portaudio.h		\
+	time.c			\
+	time.h

configure.ac

@@ -17,7 +17,7 @@ dnl                 changes are made
 dnl ---
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=102
-JACK_MICRO_VERSION=19
+JACK_MICRO_VERSION=20
 
 dnl ---
 dnl HOWTO: updating the jack protocol version
@@ -668,6 +668,22 @@ AM_CONDITIONAL(STRIPPED_JACKD, $STRIPPED_JACKD)
 AC_OUTPUT(
 Makefile
 config/Makefile
+config/cpu/Makefile
+config/cpu/alpha/Makefile
+config/cpu/cris/Makefile
+config/cpu/generic/Makefile
+config/cpu/i386/Makefile
+config/cpu/i486/Makefile
+config/cpu/ia64/Makefile
+config/cpu/m68k/Makefile
+config/cpu/mips/Makefile
+config/cpu/powerpc/Makefile
+config/cpu/s390/Makefile
+config/os/Makefile
+config/os/generic/Makefile
+config/os/gnu-linux/Makefile
+config/os/macosx/Makefile
+config/sysdeps/Makefile
 doc/Makefile
 doc/reference.doxygen
 drivers/Makefile