Commit 7fc1ac65 authored by Benjamin Drung's avatar Benjamin Drung

Imported Upstream version 2.4~beta1

parent e8b98d4a
......@@ -13,7 +13,7 @@ install-extra:
${INSTALL_FAILED}; \
fi; \
done
for i in audacious2.desktop audacious2-gtkui.desktop; do \
for i in audacious2.desktop; do \
${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${datadir}/applications && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/applications/$$i; then \
${INSTALL_OK}; \
......@@ -35,7 +35,7 @@ uninstall-extra:
fi \
fi; \
done
for i in audacious2.desktop audacious2-gtkui.desktop; do \
for i in audacious2.desktop; do \
if test -f ${DESTDIR}${datadir}/applications/$$i; then \
if rm -f ${DESTDIR}${datadir}/applications/$$i; then \
${DELETE_OK}; \
......
......@@ -173,7 +173,6 @@ AC_PATH_PROG([AR], [ar])
AC_PATH_PROG([TR], [tr])
AC_PATH_PROG([RANLIB], [ranlib])
dnl Check for Gtk+/GLib and pals
dnl ============================
AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.12.0], [Glib2])
......@@ -185,7 +184,7 @@ AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.2.4], [Cairo])
dnl Check for libmowgli
dnl ===================
AUD_CHECK_MODULE([MOWGLI], [libmowgli], [>= 0.4.0], [libmowgli],
AUD_CHECK_MODULE([MOWGLI], [libmowgli], [>= 0.7.0], [libmowgli],
[http://www.atheme.org/projects/mowgli.shtml])
......@@ -245,6 +244,8 @@ AUD_ARG_ENABLE([altivec], [yes], [AltiVec support],
])
])
AC_CHECK_FUNC([getrlimit])
])
......
[Desktop Entry]
Version=1.0
Type=Application
Name=Audacious (GTKui)
GenericName=Music Player
GenericName[be]=Музычны плэер
GenericName[da]=Lydafspiller
GenericName[de]=Musikspieler
GenericName[es]=Reproductor de Música
GenericName[fr]=Lecteur de Musique
GenericName[it]=Lettore di Musica
GenericName[lt]=Muzikos grotuvas
GenericName[nl]=Muziekspeler
GenericName[no]=Lydavspiller
GenericName[pt]=Leitor de Música
GenericName[ro]=Lector de Muzică
GenericName[ru]=Аудиоплеер
GenericName[se]=Ljudspelare
Comment=Listen to music
Comment[be]=Слухайце музыку
Comment[de]=Musik hören
Comment[fr]=Écouter de la musique
Comment[hu]=Hallgasson zenét
Comment[it]=Ascoltare musica
Comment[lt]=Klausyti muzikos
Comment[nl]=Muziek luisteren
Comment[ru]=Слушайте музыку
Icon=audacious
Categories=AudioVideo;Audio;Player;GTK;
Exec=audacious2 -i gtkui %U
TryExec=audacious2
Terminal=false
MimeType=application/x-ogg;audio/midi;audio/mp3;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg;application/xspf+xml;
......@@ -34,4 +34,4 @@ Categories=AudioVideo;Audio;Player;GTK;
Exec=audacious2 %U
TryExec=audacious2
Terminal=false
MimeType=application/x-ogg;audio/midi;audio/mp3;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg;application/xspf+xml;
MimeType=application/x-ogg;audio/midi;audio/mp3;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg;application/xspf+xml;application/x-cue;
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for audacious 2.4-alpha2.
# Generated by GNU Autoconf 2.65 for audacious 2.4-beta1.
#
# Report bugs to <bugs+audacious@atheme.org>.
#
......@@ -554,8 +554,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='audacious'
PACKAGE_TARNAME='audacious'
PACKAGE_VERSION='2.4-alpha2'
PACKAGE_STRING='audacious 2.4-alpha2'
PACKAGE_VERSION='2.4-beta1'
PACKAGE_STRING='audacious 2.4-beta1'
PACKAGE_BUGREPORT='bugs+audacious@atheme.org'
PACKAGE_URL=''
......@@ -632,6 +632,8 @@ DBUS_BINDING_TOOL
DBUS_LIBS
DBUS_CFLAGS
USE_CHARDET
LIBGUESS_LIBS
LIBGUESS_CFLAGS
AUDLDFLAGS
AUDACIOUS_PATH
SIMD_CFLAGS
......@@ -831,6 +833,8 @@ MOWGLI_CFLAGS
MOWGLI_LIBS
LIBMCS_CFLAGS
LIBMCS_LIBS
LIBGUESS_CFLAGS
LIBGUESS_LIBS
DBUS_CFLAGS
DBUS_LIBS
LIBPCRE_CFLAGS
......@@ -1380,7 +1384,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures audacious 2.4-alpha2 to adapt to many kinds of systems.
\`configure' configures audacious 2.4-beta1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1446,7 +1450,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of audacious 2.4-alpha2:";;
short | recursive ) echo "Configuration of audacious 2.4-beta1:";;
esac
cat <<\_ACEOF
......@@ -1514,6 +1518,10 @@ Some influential environment variables:
LIBMCS_CFLAGS
C compiler flags for LIBMCS, overriding pkg-config
LIBMCS_LIBS linker flags for LIBMCS, overriding pkg-config
LIBGUESS_CFLAGS
C compiler flags for LIBGUESS, overriding pkg-config
LIBGUESS_LIBS
linker flags for LIBGUESS, overriding pkg-config
DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
DBUS_LIBS linker flags for DBUS, overriding pkg-config
LIBPCRE_CFLAGS
......@@ -1591,7 +1599,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
audacious configure 2.4-alpha2
audacious configure 2.4-beta1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
......@@ -2056,7 +2064,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by audacious $as_me 2.4-alpha2, which was
It was created by audacious $as_me 2.4-beta1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
......@@ -3925,7 +3933,7 @@ fi
PACKAGE=audacious
VERSION=2.4-alpha2
VERSION=2.4-beta1
cat >>confdefs.h <<_ACEOF
......@@ -8684,7 +8692,6 @@ fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
$as_echo_n "checking for GLIB... " >&6; }
......@@ -9186,20 +9193,20 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOWGLI" >&5
$as_echo_n "checking for MOWGLI... " >&6; }
if test "x$PKG_CONFIG" != "x"; then
if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libmowgli >= 0.4.0") 2>&5
if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.7.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libmowgli >= 0.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
if test "x${MOWGLI_CFLAGS}" != "x"; then
pkg_cv_MOWGLI_CFLAGS="${MOWGLI_CFLAGS}"
else
pkg_cv_MOWGLI_CFLAGS=`$PKG_CONFIG --cflags "libmowgli >= 0.4.0" 2>/dev/null`
pkg_cv_MOWGLI_CFLAGS=`$PKG_CONFIG --cflags "libmowgli >= 0.7.0" 2>/dev/null`
fi
if test "x${MOWGLI_LIBS}" != "x"; then
pkg_cv_MOWGLI_LIBS="${MOWGLI_LIBS}"
else
pkg_cv_MOWGLI_LIBS=`$PKG_CONFIG --libs "libmowgli >= 0.4.0" 2>/dev/null`
pkg_cv_MOWGLI_LIBS=`$PKG_CONFIG --libs "libmowgli >= 0.7.0" 2>/dev/null`
fi
else
pkg_failed="yes"
......@@ -9211,9 +9218,9 @@ fi
if test "x$pkg_failed" = "xyes"; then
if test "x$_pkg_short_errors_supported" = "xyes"; then
MOWGLI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmowgli >= 0.4.0" 2>&1`
MOWGLI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmowgli >= 0.7.0" 2>&1`
else
MOWGLI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmowgli >= 0.4.0" 2>&1`
MOWGLI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmowgli >= 0.7.0" 2>&1`
fi
echo "$MOWGLI_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
......@@ -9228,7 +9235,7 @@ $as_echo "no" >&6; }
cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
as_fn_error "
libmowgli version $cv_pkg_version was found, but libmowgli >= 0.4.0 is required.
libmowgli version $cv_pkg_version was found, but libmowgli >= 0.7.0 is required.
http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
else
......@@ -9251,7 +9258,7 @@ elif test "x$pkg_failed" = "xuntried"; then
cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
as_fn_error "
libmowgli version $cv_pkg_version was found, but libmowgli >= 0.4.0 is required.
libmowgli version $cv_pkg_version was found, but libmowgli >= 0.7.0 is required.
http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
else
......@@ -9271,9 +9278,9 @@ $as_echo "yes" >&6; }
if test "x$PC_REQUIRES" = "x"; then
PC_REQUIRES="libmowgli >= 0.4.0"
PC_REQUIRES="libmowgli >= 0.7.0"
else
PC_REQUIRES="$PC_REQUIRES, libmowgli >= 0.4.0"
PC_REQUIRES="$PC_REQUIRES, libmowgli >= 0.7.0"
fi
......@@ -9488,6 +9495,12 @@ done
fi
ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
if test "x$ac_cv_func_getrlimit" = x""yes; then :
fi
......@@ -9609,9 +9622,58 @@ fi
if test "x${enable_chardet}" = "xyes"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGUESS" >&5
$as_echo_n "checking for LIBGUESS... " >&6; }
if test "x$PKG_CONFIG" != "x"; then
if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libguess\""; } >&5
($PKG_CONFIG --exists --print-errors "libguess") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
if test "x${LIBGUESS_CFLAGS}" != "x"; then
pkg_cv_LIBGUESS_CFLAGS="${LIBGUESS_CFLAGS}"
else
pkg_cv_LIBGUESS_CFLAGS=`$PKG_CONFIG --cflags "libguess" 2>/dev/null`
fi
if test "x${LIBGUESS_LIBS}" != "x"; then
pkg_cv_LIBGUESS_LIBS="${LIBGUESS_LIBS}"
else
pkg_cv_LIBGUESS_LIBS=`$PKG_CONFIG --libs "libguess" 2>/dev/null`
fi
else
pkg_failed="yes"
fi
else
pkg_failed="untried"
fi
if test "x$pkg_failed" = "xyes"; then
if test "x$_pkg_short_errors_supported" = "xyes"; then
LIBGUESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libguess" 2>&1`
else
LIBGUESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libguess" 2>&1`
fi
echo "$LIBGUESS_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
enable_chardet=no
elif test "x$pkg_failed" = "xuntried"; then
enable_chardet=no
else
LIBGUESS_CFLAGS="$pkg_cv_LIBGUESS_CFLAGS"
LIBGUESS_LIBS="$pkg_cv_LIBGUESS_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
enable_chardet=yes
fi
if test "x$enable_chardet" = "xyes"; then
$as_echo "#define USE_CHARDET 1" >>confdefs.h
fi
fi
......@@ -10854,7 +10916,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by audacious $as_me 2.4-alpha2, which was
This file was extended by audacious $as_me 2.4-beta1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -10920,7 +10982,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
audacious config.status 2.4-alpha2
audacious config.status 2.4-beta1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
......@@ -11846,14 +11908,12 @@ if test "x$AUDACIOUS_PATH" != "xno"; then
echo " Current Audacious executable: $AUDACIOUS_PATH"
fi
echo " Use one plugin dir: $enable_one_plugin_dir"
echo " Allow user plugin dir: $enable_user_plugin_dir"
echo ""
echo " Additional debugging output: $enable_debug"
echo " Automatic character code detection: $enable_chardet"
echo " D-Bus support: $enable_dbus"
echo " Session management (eggsm) $enable_sm"
echo " XSPF playlists $enable_xspf"
echo ""
echo " SSE2: $enable_sse2"
echo " AltiVec: $enable_altivec"
......
......@@ -6,7 +6,7 @@ dnl Require autoconf 2.59 or later
AC_PREREQ([2.59])
dnl Initialize
AC_INIT([audacious], [2.4-alpha2], [bugs+audacious@atheme.org])
AC_INIT([audacious], [2.4-beta1], [bugs+audacious@atheme.org])
AC_COPYRIGHT([(C) 2005-2010 Audacious Development Team])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
......@@ -121,7 +121,11 @@ dnl ===============
AUD_ARG_ENABLE([chardet], [yes],
[charset detection support],
[
AC_DEFINE([USE_CHARDET], 1, [Define if character set detection enabled])
PKG_CHECK_MODULES([LIBGUESS], [libguess], [enable_chardet=yes], [enable_chardet=no])
if test "x$enable_chardet" = "xyes"; then
AC_DEFINE([USE_CHARDET], 1, [Define if character set detection enabled])
fi
])
AUD_CONDITIONAL([USE_CHARDET], [enable_chardet])
......@@ -340,14 +344,12 @@ if test "x$AUDACIOUS_PATH" != "xno"; then
echo " Current Audacious executable: $AUDACIOUS_PATH"
fi
echo " Use one plugin dir: $enable_one_plugin_dir"
echo " Allow user plugin dir: $enable_user_plugin_dir"
echo ""
echo " Additional debugging output: $enable_debug"
echo " Automatic character code detection: $enable_chardet"
echo " D-Bus support: $enable_dbus"
echo " Session management (eggsm) $enable_sm"
echo " XSPF playlists $enable_xspf"
echo ""
echo " SSE2: $enable_sse2"
echo " AltiVec: $enable_altivec"
......
DEBUG ?= @DEBUG@
XML_CPPFLAGS ?= @XML_CPPFLAGS@
XGETTEXT ?= @XGETTEXT@
pdfdir ?= @pdfdir@
ECHO_N ?= @ECHO_N@
......@@ -10,9 +8,12 @@ target ?= @target@
CLEAN_LIB ?= @CLEAN_LIB@
bindir ?= @bindir@
INTL_LIBTOOL_SUFFIX_PREFIX ?= @INTL_LIBTOOL_SUFFIX_PREFIX@
PACKAGE_URL ?= @PACKAGE_URL@
ALLOCA ?= @ALLOCA@
LIBGUESS_CFLAGS ?= @LIBGUESS_CFLAGS@
PROG_IMPLIB_NEEDED ?= @PROG_IMPLIB_NEEDED@
dvidir ?= @dvidir@
AUDLDFLAGS ?= @AUDLDFLAGS@
PACKAGE_BUGREPORT ?= @PACKAGE_BUGREPORT@
MAKE ?= @MAKE@
INSTOBJEXT ?= @INSTOBJEXT@
......@@ -52,8 +53,8 @@ localedir ?= @localedir@
CCASDEPMODE ?= @CCASDEPMODE@
LTLIBOBJS ?= @LTLIBOBJS@
LIBICONV ?= @LIBICONV@
LDFLAGS ?= @LDFLAGS@
includedir ?= @includedir@
LDFLAGS ?= @LDFLAGS@
build_alias ?= @build_alias@
USE_NLS ?= @USE_NLS@
AUDACIOUS_DEFINES ?= @AUDACIOUS_DEFINES@
......@@ -63,7 +64,7 @@ REGEX_LIBS ?= @REGEX_LIBS@
localstatedir ?= @localstatedir@
DISCOVERY_PLUGIN_DIR ?= @DISCOVERY_PLUGIN_DIR@
docdir ?= @docdir@
CHARDET_LIBS ?= @CHARDET_LIBS@
LIBGUESS_LIBS ?= @LIBGUESS_LIBS@
LIB_LDFLAGS ?= @LIB_LDFLAGS@
CCASFLAGS ?= @CCASFLAGS@
INSTALL_SCRIPT ?= @INSTALL_SCRIPT@
......@@ -73,8 +74,8 @@ RANLIB ?= @RANLIB@
DBUS_CFLAGS ?= @DBUS_CFLAGS@
OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
pluginsubs ?= @pluginsubs@
EXEEXT ?= @EXEEXT@
PATH_SEPARATOR ?= @PATH_SEPARATOR@
EXEEXT ?= @EXEEXT@
MV ?= @MV@
GLIB_LIBS ?= @GLIB_LIBS@
GMSGFMT ?= @GMSGFMT@
......@@ -94,8 +95,9 @@ CAIRO_LIBS ?= @CAIRO_LIBS@
GTK_CFLAGS ?= @GTK_CFLAGS@
sharedstatedir ?= @sharedstatedir@
am__include ?= @am__include@
PKG_CONFIG ?= @PKG_CONFIG@
OBJEXT ?= @OBJEXT@
PKG_CONFIG ?= @PKG_CONFIG@
ICE_CFLAGS ?= @ICE_CFLAGS@
sysconfdir ?= @sysconfdir@
htmldir ?= @htmldir@
PC_REQUIRES ?= @PC_REQUIRES@
......@@ -112,7 +114,6 @@ DEPDIR ?= @DEPDIR@
PLUGIN_CFLAGS ?= @PLUGIN_CFLAGS@
ECHO_C ?= @ECHO_C@
SM_LIBS ?= @SM_LIBS@
ICE_LIBS ?= @ICE_LIBS@
USE_X86ASM ?= @USE_X86ASM@
USE_INCLUDED_LIBINTL ?= @USE_INCLUDED_LIBINTL@
psdir ?= @psdir@
......@@ -121,6 +122,7 @@ LIBMCS_CFLAGS ?= @LIBMCS_CFLAGS@
BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@
oldincludedir ?= @oldincludedir@
MSGFMT ?= @MSGFMT@
TR ?= @TR@
TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
ac_ct_CXX ?= @ac_ct_CXX@
USE_DBUS ?= @USE_DBUS@
......@@ -129,7 +131,6 @@ CAIRO_CFLAGS ?= @CAIRO_CFLAGS@
LTLIBICONV ?= @LTLIBICONV@
build_vendor ?= @build_vendor@
LIB_PREFIX ?= @LIB_PREFIX@
XML_LIBS ?= @XML_LIBS@
host_cpu ?= @host_cpu@
GTK_LIBS ?= @GTK_LIBS@
LIBPCRE_LIBS ?= @LIBPCRE_LIBS@
......@@ -142,6 +143,7 @@ LTLIBINTL ?= @LTLIBINTL@
PLUGIN_CPPFLAGS ?= @PLUGIN_CPPFLAGS@
LIBAUDCLIENT_LDFLAGS ?= @LIBAUDCLIENT_LDFLAGS@
PACKAGE_NAME ?= @PACKAGE_NAME@
DEBUG ?= @DEBUG@
ECHO_T ?= @ECHO_T@
am__quote ?= @am__quote@
LIB_SUFFIX ?= @LIB_SUFFIX@
......@@ -149,7 +151,8 @@ LIBOBJS ?= @LIBOBJS@
ac_ct_CC ?= @ac_ct_CC@
PANGO_LIBS ?= @PANGO_LIBS@
PACKAGE_VERSION ?= @PACKAGE_VERSION@
XML2_CONFIG ?= @XML2_CONFIG@
LDFLAGS_RPATH ?= @LDFLAGS_RPATH@
ICE_LIBS ?= @ICE_LIBS@
INTLBISON ?= @INTLBISON@
LN_S ?= @LN_S@
INSTALL_LIB ?= @INSTALL_LIB@
......@@ -179,7 +182,3 @@ EGREP ?= @EGREP@
AUDACIOUS_PATH ?= @AUDACIOUS_PATH@
ARCH_X86 ?= @ARCH_X86@
VERSION ?= @VERSION@
AUDLDFLAGS ?= @AUDLDFLAGS@
TR = @TR@
PLUGIN_DEFNAME := `echo ${subst ${PLUGIN_SUFFIX},,${PLUGIN}} | tr '[:lower:]' '[:upper:]' | tr '-' '_'`
PLUGIN_CPPFLAGS += -D${PLUGIN_DEFNAME}_CFGID="\"${subst ${PLUGIN_SUFFIX},,${PLUGIN}}\""
......@@ -7,7 +7,8 @@
# have been introduced, and then continue with 'make update-po' or
# 'make update-pot' respectively.
#
LOCALES = be.po \
LOCALES = ast.po \
be.po \
bg.po \
br.po \
ca.po \
......@@ -54,6 +55,7 @@ update-pot:
@echo Updating $(POTTEMPLATE) ...
xgettext --default-domain=$(PACKAGE) --language=C \
--keyword=_ --keyword=N_ --from-code="utf-8" \
--msgid-bugs-address="http://jira.atheme.org/" \
--directory=.. --files-from=POTFILES.in -o $(POTTEMPLATE)
update-po: update-pot
......
# Please don't update this file manually - use ./update-potfiles.sh instead!
src/audacious/auddrct.c
src/audacious/credits.c
src/audacious/drct.c
src/audacious/equalizer_preset.c
src/audacious/folder-add.c
src/audacious/input.c
src/audacious/interface.c
src/audacious/intl/os2compat.c
src/audacious/logger.c
......@@ -11,19 +10,22 @@ src/audacious/main.c
src/audacious/playback.c
src/audacious/playlist-new.c
src/audacious/pluginenum.c
src/audacious/ui_fileinfo.c
src/audacious/ui_fileinfopopup.c
src/audacious/ui_headless.c
src/audacious/ui_misc.c
src/audacious/ui_preferences.c
src/audacious/util.c
src/audtool/handlers_playlist.c
src/audtool/handlers_vitals.c
src/libaudcore/audstrings.c
src/libaudgui/confirm.c
src/libaudgui/effects-menu.c
src/libaudgui/equalizer.c
src/libaudgui/infopopup.c
src/libaudgui/infowin.c
src/libaudgui/ui_about.c
src/libaudgui/ui_credits.c
src/libaudgui/ui_fileopener.c
src/libaudgui/ui_jumptotrack.c
src/libaudgui/ui_playlist_manager.c
src/libaudgui/ui_urlopener.c
src/libeggsmclient/eggdesktopfile.c
src/libeggsmclient/eggsmclient.c
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
SUBDIRS = libaudcore libaudgui libguess libaudtag audacious
SUBDIRS = libaudcore libaudgui libaudtag audacious
include ../extra.mk
......
......@@ -3,22 +3,18 @@ include ../../extra.mk
SUBDIRS = ${INTL_OBJECTIVE}
PROG = audacious2${PROG_SUFFIX}
SRCS = auddrct.c \
audconfig.c \
SRCS = audconfig.c \
chardet.c \
configdb.c \
credits.c \
drct.c \
effect.c \
equalizer.c \
equalizer_preset.c \
eventqueue.c \
fft.c \
flow.c \
folder-add.c \
general.c \
hook.c \
interface.c \
input.c \
logger.c \
main.c \
output.c \
......@@ -29,9 +25,8 @@ SRCS = auddrct.c \
pluginenum.c \
plugin-registry.c \
probe.c \
rcfile.c \
probe-buffer.c \
signals.c \
ui_headless.c \
ui_plugin_menu.c \
ui_preferences.c \
util.c \
......@@ -44,25 +39,30 @@ ifeq ($(USE_DBUS),yes)
SRCS += dbus.c
endif
INCLUDES = auddrct.h \
audconfig.h \
INCLUDES = api.h \
api-alias-begin.h \
api-alias-end.h \
api-define-begin.h \
api-define-end.h \
audconfig.h \
configdb.h \
configdb-api.h \
dbus.h \
dbus-service.h \
equalizer_preset.h \
eventqueue.h \
flow.h \
rcfile.h \
debug.h \
drct.h \
drct-api.h \
i18n.h \
input.h \
hook.h \
interface.h \
main.h \
playback.h \
playlist_container.h \
misc.h \
misc-api.h \
playlist.h \
playlist-api.h \
plugin.h \
plugins.h \
plugins-api.h \
preferences.h \
ui_plugin_menu.h
types.h
DATA = images/about-logo.png \
images/appearance.png \
......@@ -82,7 +82,6 @@ DATA = images/about-logo.png \
images/replay_gain.png
CLEAN = build_stamp.c dbus-client-bindings.h dbus-server-bindings.h