Automake cleanups.

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644 (file)
index 748cd6a..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Package name */
-#undef PACKAGE
-
-/* Package version */
-#undef VERSION
-
-/* Sound library version string */
-#undef SND_LIB_VERSION
-
-/* DATA directory */
-#undef DATADIR
-
-/* NDEBUG */
-#undef NDEBUG
-
-/* Do we have FPU on this machine? */
-#undef HAVE_SOFT_FLOAT
-
-/* Use versioned symbols for shared library? */
-#undef VERSIONED_SYMBOLS

diff --git a/acinclude.m4 b/acinclude.m4
index 7dce7fbd0994f00380c028bce0c7b87df6d4c0cc..7baaf0b1e77c3b20525a91d712226814485930d1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,7 +2,7 @@ AC_DEFUN(SAVE_LIBRARY_VERSION, [
 AC_MSG_CHECKING(for library version)
 SND_LIB_VERSION=$VERSION
 echo $VERSION > $srcdir/version
-AC_DEFINE_UNQUOTED(VERSION, "$SND_LIB_VERSION")
+AC_DEFINE_UNQUOTED(VERSION, "$SND_LIB_VERSION", [sound library version string])
 AC_SUBST(SND_LIB_VERSION)
 SND_LIB_MAJOR=`echo $VERSION | cut -d . -f 1`
 AC_SUBST(SND_LIB_MAJOR)

diff --git a/configure.in b/configure.in
index bf18aa7567566830f654d372350c57ba28c41499..47217edb5ef2c8850fc96d64cfbe00c30891326a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl add API = c+1:0:a+1
 dnl remove API = c+1:0:0
 dnl *************************************************
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 0.9.0rc8b)
+AM_INIT_AUTOMAKE(alsa-lib, 0.9.0rc8c)
 eval LIBTOOL_VERSION_INFO="2:0:0"
 dnl *************************************************
 AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")
@@ -161,7 +161,7 @@ esac
 AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile include/Makefile
          include/sound/Makefile src/Makefile \
           src/control/Makefile src/mixer/Makefile
-         src/pcm/Makefile src/pcm/ext/Makefile \
+         src/pcm/Makefile src/pcm/ext/Makefile src/pcm/scopes/Makefile \
          src/rawmidi/Makefile src/timer/Makefile \
           src/hwdep/Makefile src/seq/Makefile src/instr/Makefile \
           src/compat/Makefile src/conf/Makefile \

diff --git a/src/pcm/Makefile.am b/src/pcm/Makefile.am
index a32755ebdd0871658b08bf44595915545f46ebde..6d3c98ceedd8a41796d767b9b533bcd6bcb1dbd3 100644 (file)
--- a/src/pcm/Makefile.am
+++ b/src/pcm/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS = ext
+SUBDIRS =
+DIST_SUBDIRS = ext scopes
 
 EXTRA_LTLIBRARIES = libpcm.la
 

diff --git a/src/pcm/scopes/Makefile.am b/src/pcm/scopes/Makefile.am
index 634d180ae0d9b5d532f9b3d758fc96841c30decb..808fca2a8f9dd5e03c759bfceed5fe8a48bbc310 100644 (file)
--- a/src/pcm/scopes/Makefile.am
+++ b/src/pcm/scopes/Makefile.am
@@ -1,7 +1,7 @@
 
 CFLAGS = -g -O2 -W -Wall
 
-lib_LTLIBRARIES = liblevel.la
+pkglib_LTLIBRARIES = liblevel.la
 
 liblevel_la_SOURCES = level.c
 liblevel_la_LIBADD = -lncurses

diff --git a/src/pcm/scopes/configure.in b/src/pcm/scopes/configure.in
deleted file mode 100644 (file)
index 3e81615..0000000
--- a/src/pcm/scopes/configure.in
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(level.c)
-AM_INIT_AUTOMAKE(scopes, 0.9)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S 
-AM_PROG_LIBTOOL
-
-AC_OUTPUT(Makefile)

diff --git a/src/pcm/scopes/cvscompile b/src/pcm/scopes/cvscompile
deleted file mode 100644 (file)
index d926632..0000000
--- a/src/pcm/scopes/cvscompile
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-libtoolize --force --copy --automake
-aclocal $ACLOCAL_FLAGS
-automake --foreign --add-missing
-autoconf
-export CFLAGS='-O2 -Wall -W -pipe -g'
-echo "CFLAGS=$CFLAGS"
-echo "./configure $@"
-./configure $@
-unset CFLAGS
-make