mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-10-29 05:40:23 -04:00
build-sys: dropo shave support, depend on automake's new silent build support instead
This commit is contained in:
Lennart Poettering
parent
de5219aafb
commit
048e576a6d
7 changed files with 5 additions and 239 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,6 +1,4 @@
|
|||
.version
|
||||
shave
|
||||
shave-libtool
|
||||
.*.swp
|
||||
ABOUT-NLS
|
||||
intltool-extract.in
|
||||
|
|
|
|||
|
|
@ -62,12 +62,6 @@ dist-hook:
|
|||
fi
|
||||
echo $(VERSION) > $(distdir)/.tarball-version
|
||||
|
||||
update-shave:
|
||||
for i in shave.in shave.m4 shave-libtool.in; do \
|
||||
wget -O $$i http://git.lespiau.name/cgit/shave/blob/\?path=shave/$$i ; \
|
||||
done
|
||||
mv shave.m4 m4/
|
||||
|
||||
.PHONY: homepage distcleancheck doxygen
|
||||
|
||||
# see git-version-gen
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
# along with PulseAudio; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
|
||||
VERSION=1.10
|
||||
VERSION=1.11
|
||||
|
||||
run_versioned() {
|
||||
local P
|
||||
|
|
@ -83,7 +83,7 @@ else
|
|||
run_versioned automake "$VERSION" --copy --foreign --add-missing
|
||||
|
||||
if test "x$NOCONFIGURE" = "x"; then
|
||||
CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen --enable-shave "$@"
|
||||
CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
|
||||
make clean
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ AC_INIT([pulseaudio], m4_esyscmd([./git-version-gen .tarball-version]),
|
|||
AC_CONFIG_SRCDIR([src/daemon/main.c])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability])
|
||||
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules])
|
||||
|
||||
m4_define(pa_major, `echo $VERSION | cut -d. -f 1`)
|
||||
m4_define(pa_minor, `echo $VERSION | cut -d. -f 2`)
|
||||
|
|
@ -76,6 +76,8 @@ case $host in
|
|||
;;
|
||||
esac
|
||||
|
||||
AM_SILENT_RULES([yes])
|
||||
|
||||
#### Checks for programs. ####
|
||||
|
||||
# mkdir -p
|
||||
|
|
@ -1316,8 +1318,6 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "xyes"])
|
|||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
shave
|
||||
shave-libtool
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
libpulse.pc
|
||||
|
|
@ -1330,7 +1330,6 @@ src/pulse/version.h
|
|||
po/Makefile.in
|
||||
])
|
||||
|
||||
SHAVE_INIT
|
||||
AC_OUTPUT
|
||||
|
||||
# ==========================================================================
|
||||
|
|
|
|||
77
m4/shave.m4
77
m4/shave.m4
|
|
@ -1,77 +0,0 @@
|
|||
dnl Make automake/libtool output more friendly to humans
|
||||
dnl Damien Lespiau <damien.lespiau@gmail.com>
|
||||
dnl
|
||||
dnl SHAVE_INIT([shavedir],[default_mode])
|
||||
dnl
|
||||
dnl shavedir: the directory where the shave scripts are, it defaults to
|
||||
dnl $(top_builddir)
|
||||
dnl default_mode: (enable|disable) default shave mode. This parameter
|
||||
dnl controls shave's behaviour when no option has been
|
||||
dnl given to configure. It defaults to disable.
|
||||
dnl
|
||||
dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
|
||||
dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and
|
||||
dnl LIBTOOL, you don't want the configure tests to have these variables
|
||||
dnl re-defined.
|
||||
dnl * This macro requires GNU make's -s option.
|
||||
|
||||
AC_DEFUN([_SHAVE_ARG_ENABLE],
|
||||
[
|
||||
AC_ARG_ENABLE([shave],
|
||||
AS_HELP_STRING(
|
||||
[--enable-shave],
|
||||
[use shave to make the build pretty [[default=$1]]]),,
|
||||
[enable_shave=$1]
|
||||
)
|
||||
])
|
||||
|
||||
AC_DEFUN([SHAVE_INIT],
|
||||
[
|
||||
dnl you can tweak the default value of enable_shave
|
||||
m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
|
||||
|
||||
if test x"$enable_shave" = xyes; then
|
||||
dnl where can we find the shave scripts?
|
||||
m4_if([$1],,
|
||||
[shavedir="$ac_pwd"],
|
||||
[shavedir="$ac_pwd/$1"])
|
||||
AC_SUBST(shavedir)
|
||||
|
||||
dnl make is now quiet
|
||||
AC_SUBST([MAKEFLAGS], [-s])
|
||||
AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
|
||||
|
||||
dnl we need sed
|
||||
AC_CHECK_PROG(SED,sed,sed,false)
|
||||
|
||||
dnl substitute libtool
|
||||
SHAVE_SAVED_LIBTOOL=$LIBTOOL
|
||||
LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
|
||||
AC_SUBST(LIBTOOL)
|
||||
|
||||
dnl substitute cc/cxx
|
||||
SHAVE_SAVED_CC=$CC
|
||||
SHAVE_SAVED_CXX=$CXX
|
||||
SHAVE_SAVED_FC=$FC
|
||||
SHAVE_SAVED_F77=$F77
|
||||
SHAVE_SAVED_OBJC=$OBJC
|
||||
CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
|
||||
CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
|
||||
FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
|
||||
F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
|
||||
OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
|
||||
AC_SUBST(CC)
|
||||
AC_SUBST(CXX)
|
||||
AC_SUBST(FC)
|
||||
AC_SUBST(F77)
|
||||
AC_SUBST(OBJC)
|
||||
|
||||
V=@
|
||||
else
|
||||
V=1
|
||||
fi
|
||||
Q='$(V:1=)'
|
||||
AC_SUBST(V)
|
||||
AC_SUBST(Q)
|
||||
])
|
||||
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# we need sed
|
||||
SED=@SED@
|
||||
if test -z "$SED" ; then
|
||||
SED=sed
|
||||
fi
|
||||
|
||||
lt_unmangle ()
|
||||
{
|
||||
last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
|
||||
}
|
||||
|
||||
# the real libtool to use
|
||||
LIBTOOL="$1"
|
||||
shift
|
||||
|
||||
# if 1, don't print anything, the underlaying wrapper will do it
|
||||
pass_though=0
|
||||
|
||||
# scan the arguments, keep the right ones for libtool, and discover the mode
|
||||
preserved_args=
|
||||
while test "$#" -gt 0; do
|
||||
opt="$1"
|
||||
shift
|
||||
|
||||
case $opt in
|
||||
--mode=*)
|
||||
mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
|
||||
preserved_args="$preserved_args $opt"
|
||||
;;
|
||||
-o)
|
||||
lt_output="$1"
|
||||
preserved_args="$preserved_args $opt"
|
||||
;;
|
||||
*)
|
||||
preserved_args="$preserved_args $opt"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
case "$mode" in
|
||||
compile)
|
||||
# shave will be called and print the actual CC/CXX/LINK line
|
||||
preserved_args="$preserved_args --shave-mode=$mode"
|
||||
pass_though=1
|
||||
;;
|
||||
link)
|
||||
preserved_args="$preserved_args --shave-mode=$mode"
|
||||
Q=" LINK "
|
||||
;;
|
||||
*)
|
||||
# let's u
|
||||
# echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
|
||||
;;
|
||||
esac
|
||||
|
||||
lt_unmangle "$lt_output"
|
||||
output=$last_result
|
||||
|
||||
if test -z $V; then
|
||||
if test $pass_though -eq 0; then
|
||||
echo "$Q$output"
|
||||
fi
|
||||
$LIBTOOL --silent $preserved_args
|
||||
else
|
||||
echo $LIBTOOL $preserved_args
|
||||
$LIBTOOL $preserved_args
|
||||
fi
|
||||
79
shave.in
79
shave.in
|
|
@ -1,79 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# we need sed
|
||||
SED=@SED@
|
||||
if test -z "$SED" ; then
|
||||
SED=sed
|
||||
fi
|
||||
|
||||
lt_unmangle ()
|
||||
{
|
||||
last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
|
||||
}
|
||||
|
||||
# the tool to wrap (cc, cxx, ar, ranlib, ..)
|
||||
tool="$1"
|
||||
shift
|
||||
|
||||
# the reel tool (to call)
|
||||
REEL_TOOL="$1"
|
||||
shift
|
||||
|
||||
pass_through=0
|
||||
preserved_args=
|
||||
while test "$#" -gt 0; do
|
||||
opt="$1"
|
||||
shift
|
||||
|
||||
case $opt in
|
||||
--shave-mode=*)
|
||||
mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
|
||||
;;
|
||||
-o)
|
||||
lt_output="$1"
|
||||
preserved_args="$preserved_args $opt"
|
||||
;;
|
||||
*)
|
||||
preserved_args="$preserved_args $opt"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# mode=link is handled in the libtool wrapper
|
||||
case "$mode,$tool" in
|
||||
link,*)
|
||||
pass_through=1
|
||||
;;
|
||||
*,cxx)
|
||||
Q=" CXX "
|
||||
;;
|
||||
*,cc)
|
||||
Q=" CC "
|
||||
;;
|
||||
*,fc)
|
||||
Q=" FC "
|
||||
;;
|
||||
*,f77)
|
||||
Q=" F77 "
|
||||
;;
|
||||
*,objc)
|
||||
Q=" OBJC "
|
||||
;;
|
||||
*,*)
|
||||
# should not happen
|
||||
Q=" CC "
|
||||
;;
|
||||
esac
|
||||
|
||||
lt_unmangle "$lt_output"
|
||||
output=$last_result
|
||||
|
||||
if test -z $V; then
|
||||
if test $pass_through -eq 0; then
|
||||
echo "$Q$output"
|
||||
fi
|
||||
$REEL_TOOL $preserved_args
|
||||
else
|
||||
echo $REEL_TOOL $preserved_args
|
||||
$REEL_TOOL $preserved_args
|
||||
fi
|
||||
Loading…
Add table
Add a link
Reference in a new issue