Commit de557c91 authored by Cyril Lavier's avatar Cyril Lavier

Imported Upstream version 3.2

parent 95ef6905
Audacious (C) GPL 2005-2009
Audacious
=========
This file is quite out of date and in the process of being updated.
Audacious core shared library (src/libaudcore):
* Copyright (C) 2006-2011:
Daniel Barkalow
Christian Birchinger
Ralf Ertzinger
Maciej Grela
Matti Hämäläinen
John Lindgren
Giacomo Lozito
William Pitcock
Tony Vroon
Yoshiki Yazawa
Eugene Zagidullin
Audacious user interface shared library (src/libaudgui):
* Copyright (C) 1998-2003 XMMS development team
* Copyright (C) 2003-2004 BMP development team
* Copyright (C) 2006-2012:
Carlo Bramini
Michael Färber
Jussi Judin
John Lindgren
Giacomo Lozito
Tomasz Moń
William Pitcock
Yoshiki Yazawa
Eugene Zagidullin
Session management support (src/libeggsmclient):
* Copyright (C) 1999-2000 Red Hat, Inc.
* Copyright (C) 2001 George Lebl
* Copyright (C) 2007 Novell, Inc.
Old AUTHORS file
================
Authors listed alphabetically, by last name:
--------------------------------------------
......
......@@ -22,10 +22,9 @@ this program. If not, see <http://www.gnu.org/licenses/>.
***
The files src/audacious/images/{album appearance audio connectivity
menu_playlist menu_plugin menu_queue_toggle playlist plugins replay_gain}.png
are taken from the icon theme of Gnome 2.30.3 and are distributed under the
following terms:
The files src/audacious/images/{album audio connectivity menu_playlist
menu_plugin menu_queue_toggle playlist plugins}.png are taken from the icon
theme of Gnome 2.30.3 and are distributed under the following terms:
Copyright (C) Ulisse Perusin, Riccardo Buzzotta, Josef Vybíral, Hylke Bons,
Ricardo González, Lapo Calamandrei, Rodney Dawes, Luca Ferretti, Tuomas
......
This diff is collapsed.
The atheme.org mercurial repository is available for anonymous read-only
access.
To retrieve the audacious development branch from hg.atheme.org, do:
$ hg clone http://hg.atheme.org/audacious/ audacious-devel
To retrieve the audacious stable branch from hg.atheme.org, do:
$ hg clone http://hg.atheme.org/release/audacious-$VERSION/
Where $VERSION is the stable major version, for example the latest
fixes and updates to 1.5-series of audacious would be in:
$ hg clone http://hg.atheme.org/release/audacious-1.5/
This diff is collapsed.
......@@ -503,12 +503,12 @@ Currently, we only provide source tarballs at:
http://audacious-media-player.org/downloads
Audacious source is managed and also available via Atheme.org
Mercurial repository, refer to following web-page for information:
Audacious source is managed and also available via the Atheme.org
GIT repository, refer to following web-page for information:
http://audacious-media-player.org/developers
You may also want to read file "Mercurial-Access".
You may also want to read file "GIT-Access".
4.1. Obtaining Skins
......
dnl ** ADD_PKG_REQUIRES([requirement])
dnl ** Adds a dependency to package's pkg-config file.
AC_DEFUN([ADD_PC_REQUIRES], [
if test "x$PC_REQUIRES" = "x"; then
PC_REQUIRES="$1"
else
PC_REQUIRES="$PC_REQUIRES, $1"
fi
AC_SUBST([PC_REQUIRES])
])
dnl ** AUD_CHECK_MODULE([define name], [module], [version required],
dnl ** [informational name], [additional error message])
dnl **
......@@ -21,7 +8,6 @@ dnl **
dnl ** AUD_CHECK_MODULE([GLIB], [gtk+-2.0], [>= 2.8.0], [Gtk+2], [See http://www.gtk.org/])
AC_DEFUN([AUD_CHECK_MODULE], [
PKG_CHECK_MODULES([$1], [$2 $3], [
ADD_PC_REQUIRES([$2 $3])
],[
PKG_CHECK_EXISTS([$2], [
cv_pkg_version=`$PKG_CONFIG --modversion "$2" 2>/dev/null`
......@@ -142,6 +128,23 @@ define([aud_get_plugin_dirs_defined],[1])dnl
])dnl
dnl Add $1 to CFLAGS and CXXFLAGS if supported
dnl ------------------------------------------
AC_DEFUN([AUD_CHECK_CFLAGS],[
AC_MSG_CHECKING([whether the C/C++ compiler supports $1])
OLDCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $1 -Werror"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],[
AC_MSG_RESULT(yes)
CFLAGS="$OLDCFLAGS $1"
CXXFLAGS="$CXXFLAGS $1"
],[
AC_MSG_RESULT(no)
CFLAGS="$OLDCFLAGS"
])
])
dnl **
dnl ** Common checks
......@@ -150,20 +153,34 @@ AC_DEFUN([AUD_COMMON_PROGS], [
dnl Check for C and C++ compilers
dnl =============================
AUD_CHECK_GNU_MAKE
AC_PROG_CC
AC_PROG_CXX
AM_PROG_AS
AC_ISC_POSIX
AC_C_BIGENDIAN
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AM_PROG_AS])
AC_REQUIRE([AC_C_BIGENDIAN])
AC_REQUIRE([AC_SYS_LARGEFILE])
if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall -pipe"
CXXFLAGS="$CXXFLAGS -pipe -Wall"
CFLAGS="$CFLAGS -std=gnu99 -Wall -pipe"
CXXFLAGS="$CXXFLAGS -Wall -pipe"
AUD_CHECK_CFLAGS(-Wtype-limits)
fi
dnl Enable "-Wl,-z,defs" only on Linux
dnl ==============================
AC_MSG_CHECKING([for Linux])
case "$target" in
*linux*)
AC_MSG_RESULT([yes])
LDFLAGS="$LDFLAGS -Wl,-z,defs"
;;
*)
AC_MSG_RESULT([no])
;;
esac
dnl Checks for various programs
dnl ===========================
AUD_CHECK_GNU_MAKE
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PATH_PROG([RM], [rm])
......@@ -172,85 +189,14 @@ AC_PATH_PROG([CP], [cp])
AC_PATH_PROG([AR], [ar])
AC_PATH_PROG([TR], [tr])
AC_PATH_PROG([RANLIB], [ranlib])
AC_PATH_PROG([WINDRES], [windres])
dnl Check for Gtk+/GLib and pals
dnl ============================
AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.12.0], [Glib2])
AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.12.0], [gthread-2.0])
if test $use_gtk3 = yes ; then
AUD_CHECK_MODULE([GTK], [gtk+-3.0], [>= 3.0.0], [Gtk+3])
else
AUD_CHECK_MODULE([GTK], [gtk+-2.0], [>= 2.8.0], [Gtk+2])
fi
AUD_CHECK_MODULE([PANGO], [pango], [>= 1.8.0], [Pango])
AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.2.4], [Cairo])
dnl Check for libmowgli
dnl ===================
AUD_CHECK_MODULE([MOWGLI], [libmowgli], [>= 0.9], [libmowgli],
[http://www.atheme.org/projects/mowgli.shtml])
dnl Check for libmcs
dnl ================
AUD_CHECK_MODULE([LIBMCS], [libmcs], [>= 0.7], [libmcs],
[http://www.atheme.org/projects/mcs.shtml])
dnl SSE2 support
dnl ============
AUD_ARG_ENABLE([sse2], [yes], [SSE2 support],
[
AC_MSG_CHECKING([SSE2 support])
aud_my_save_CFLAGS="$CFLAGS"
CFLAGS="-msse2"
AC_TRY_RUN([
#include <emmintrin.h>
int main()
{
_mm_setzero_pd();
asm volatile("xorpd %xmm0,%xmm0\n\t");
return 0;
}
],[
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_SSE2], 1, [Define to 1 if your system has SSE2 support])
SIMD_CFLAGS="-msse2"
],[
AC_MSG_RESULT([no])
enable_sse2="no"
])
AC_SUBST([SIMD_CFLAGS])
CFLAGS="$aud_my_save_CFLAGS"
])
dnl AltiVec support
dnl ===============
AUD_ARG_ENABLE([altivec], [yes], [AltiVec support],
[
AC_CHECK_HEADERS([altivec.h],
[
AC_DEFINE([HAVE_ALTIVEC], 1, [Define to 1 if your system has AltiVec.])
AC_DEFINE([HAVE_ALTIVEC_H], 1, [Define to 1 if your system has an altivec.h file.])
AC_DEFINE([ARCH_POWERPC], 1, [Define to 1 if your system is a PowerPC.])
case $target in
*-apple-*)
SIMD_CFLAGS="-mpim-altivec"
;;
*)
SIMD_CFLAGS="-maltivec"
;;
esac
AC_SUBST([SIMD_CFLAGS])
],[
enable_altivec="no"
])
])
AC_CHECK_FUNC([getrlimit])
AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
])
......
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -1834,7 +1835,8 @@ AC_DEFUN([AM_NLS],
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
......@@ -1880,7 +1882,8 @@ m4_define([_PKG_CONFIG],
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
......@@ -1928,9 +1931,9 @@ if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
......@@ -1954,7 +1957,7 @@ path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
......@@ -2565,14 +2568,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 10
# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
......@@ -2612,6 +2615,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
......@@ -2676,7 +2680,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
msvisualcpp | msvcmsys)
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
......@@ -2741,10 +2745,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
AC_SUBST([am__nodep])dnl
_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
......@@ -2900,12 +2907,15 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
......@@ -2928,13 +2938,14 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 4
# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
......@@ -2942,13 +2953,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
# ------------------------------
# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
# ----------------------------------
# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
......@@ -2959,13 +2970,13 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 2
# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
......@@ -2974,7 +2985,7 @@ AC_DEFUN([_AM_IF_OPTION],
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
......
prefix=@prefix@
exec_prefix=@exec_prefix@
data_dir=@datadir@/@PACKAGE_NAME@
data_dir=@datadir@/@PACKAGE@
version=@PACKAGE_VERSION@
version=@VERSION@
include_dir=@includedir@
audacious_include_dir=@includedir@
lib_dir=@libdir@
......@@ -19,7 +19,6 @@ discovery_plugin_dir=@plugindir@/@DISCOVERY_PLUGIN_DIR@
Name: Audacious
Description: Audacious is a versatile and handy multi platform media player
Version: @PACKAGE_VERSION@
Requires: @PC_REQUIRES@
Version: @VERSION@
Libs: -L${lib_dir} -laudcore -laudgui
Cflags: -I${audacious_include_dir}
prefix=@prefix@
exec_prefix=@exec_prefix@
data_dir=@datadir@/@PACKAGE_NAME@
data_dir=@datadir@/@PACKAGE@
version=@PACKAGE_VERSION@
version=@VERSION@
audacious_include_dir=@includedir@
lib_dir=@libdir@
Name: Audacious Client Library
Description: Remote control library for Audacious
Version: @PACKAGE_VERSION@
Requires: @PC_REQUIRES@
Version: @VERSION@
Libs: -L${lib_dir} @LIBAUDCLIENT_LDFLAGS@
Cflags: -I${audacious_include_dir}
#
# Copyright (c) 2007 - 2009, Jonathan Schleifer <js@webkeks.org>
# Copyright (c) 2007, 2008, 2009, 2010, 2011
# Jonathan Schleifer <js@webkeks.org>
#
# https://webkeks.org/hg/buildsys/
#
......@@ -63,6 +64,10 @@ MKDIR_P = mkdir -p
INSTALL = @INSTALL@
SHELL = @SHELL@
MSGFMT = @MSGFMT@
JAVAC = @JAVAC@
JAVACFLAGS = @JAVACFLAGS@
JAR = @JAR@
WINDRES = @WINDRES@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
......@@ -82,11 +87,13 @@ OBJS2 = ${OBJS1:.cc=.o}
OBJS3 = ${OBJS2:.cxx=.o}
OBJS4 = ${OBJS3:.d=.o}
OBJS5 = ${OBJS4:.erl=.beam}
OBJS6 = ${OBJS5:.m=.o}
OBJS7 = ${OBJS6:.mm=.o}
OBJS8 = ${OBJS7:.py=.pyc}
OBJS9 = ${OBJS8:.xpm=.o}
OBJS += ${OBJS9:.S=.o}
OBJS6 = ${OBJS5:.java=.class}
OBJS7 = ${OBJS6:.m=.o}
OBJS8 = ${OBJS7:.mm=.o}
OBJS9 = ${OBJS8:.py=.pyc}
OBJS10 = ${OBJS9:.rc=.o}
OBJS11 = ${OBJS10:.S=.o}
OBJS += ${OBJS11:.xpm=.o}
LIB_OBJS = ${OBJS:.o=.lib.o}
PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
......@@ -95,13 +102,13 @@ MO_FILES = ${LOCALES:.po=.mo}
.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .cxx .cxx.dep .d .erl .lib.o .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .xpm .S .S.dep
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
all:
${MAKE} ${MFLAGS} subdirs || exit 1
${MAKE} ${MFLAGS} depend || exit 1
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} locales || exit 1
${MAKE} ${MFLAGS} subdirs
${MAKE} ${MFLAGS} depend
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
subdirs:
for i in ${SUBDIRS}; do \
......@@ -122,7 +129,7 @@ depend: pre-depend ${SRCS}
;; \
esac; \
done; \
if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
${DEPEND_STATUS}; \
if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
rm -f $$deps; \
......@@ -149,20 +156,29 @@ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
${LINK_FAILED}; \
fi
${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS}
${LINK_STATUS}
if test x"${JAR_MANIFEST}" != x""; then \
if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS}; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
fi \
else \
if ${JAR} cf ${JARFILE} ${OBJS}; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
fi \
fi
${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS}
case $@ in \
*.a) \
${MAKE} ${MFLAGS} STATIC_LIB=${LIB} LIB= $@ || exit 1 \
;; \
*) \
${LINK_STATUS}; \
if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
fi \
;; \
esac
${LINK_STATUS}; \
if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
fi \
${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
${LINK_STATUS}
......@@ -174,7 +190,44 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS}
${LINK_STATUS}
if ${AR} cr $@ ${OBJS} && ${RANLIB} $@; then \
rm -f $@
objs=""; \
ars=""; \
for i in ${OBJS}; do \
case $$i in \
*.a) \
ars="$$ars $$i" \
;; \
*.o) \
objs="$$objs $$i" \
;; \
esac \
done; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
mkdir -p $$dir; \
cd $$dir; \
ar x ../$$i; \
for j in *.o; do \
objs="$$objs $$dir/$$j"; \
done; \
cd ..; \
done; \
if ${AR} cr $@ $$objs && ${RANLIB} $@; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
rm -f $@; \
fi; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
done
${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS}
${LINK_STATUS}
if ${AR} cr $@ ${LIB_OBJS} && ${RANLIB} $@; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
......@@ -251,6 +304,14 @@ locales: ${MO_FILES}
${COMPILE_FAILED}; \
fi
.java.class:
${COMPILE_STATUS}
if ${JAVAC} ${JAVACFLAGS} $<; then \
${COMPILE_OK}; \
else \
${COMPILE_FAILED}; \
fi
.m.o:
${COMPILE_STATUS}
if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
......@@ -311,51 +372,59 @@ locales: ${MO_FILES}
${COMPILE_FAILED}; \
fi
.xpm.o:
.rc.o .rc.lib.o .rc.plugin.o:
${COMPILE_STATUS}
if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
if ${WINDRES} -J rc -O coff -o $@ $<; then \
${COMPILE_OK}; \
else \
${COMPILE_FAILED}; \
fi
.xpm.lib.o:
.S.o:
${COMPILE_STATUS}
if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
${COMPILE_OK}; \
else \
${COMPILE_FAILED}; \
fi
.S.lib.o:
${COMPILE_LIB_STATUS}
if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
${COMPILE_LIB_OK}; \
else \
${COMPILE_LIB_FAILED}; \