From 7f888e23f50c2e1880969bef283cecf7d229eecc Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Mar 2003 16:55:24 +0000 Subject: [PATCH] Automake cleanups. --- acconfig.h | 20 -------------------- acinclude.m4 | 2 +- configure.in | 4 ++-- src/pcm/Makefile.am | 3 ++- src/pcm/scopes/Makefile.am | 2 +- src/pcm/scopes/configure.in | 9 --------- src/pcm/scopes/cvscompile | 12 ------------ 7 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 acconfig.h delete mode 100644 src/pcm/scopes/configure.in delete mode 100644 src/pcm/scopes/cvscompile diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index 748cd6a8..00000000 --- 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 7dce7fbd..7baaf0b1 100644 --- 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 bf18aa75..47217edb 100644 --- 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 a32755eb..6d3c98ce 100644 --- 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 634d180a..808fca2a 100644 --- 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 index 3e816156..00000000 --- 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 index d9266321..00000000 --- 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 -- 2.47.3