Mercurial > audlegacy
changeset 3587:ed6ec0e94afc trunk
Automated merge with ssh://sidhe.atheme.org//hg/audacious
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Fri, 21 Sep 2007 15:18:09 +0200 |
| parents | ddb15c329985 (diff) 8e50c2cd44f0 (current diff) |
| children | f104e23b87da |
| files | |
| diffstat | 5 files changed, 8 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/buildsys.mk.in Thu Sep 20 23:09:16 2007 +0300 +++ b/buildsys.mk.in Fri Sep 21 15:18:09 2007 +0200 @@ -61,7 +61,6 @@ includesubdir ?= ${PACKAGE} mandir = @mandir@ mansubdir ?= man1 -pkgdatadir = ${datadir}/${PACKAGE} OBJS1 = ${SRCS:.c=.o} OBJS2 = ${OBJS1:.cc=.o} @@ -70,10 +69,6 @@ OBJS5 = ${OBJS4:.erl=.beam} OBJS += ${OBJS5:.m=.o} -ifneq ($(strip $(prefix)),) - RPATH = -Wl,-rpath=${libdir} -endif - .SILENT: .SUFFIXES: .beam .c .cc .cxx .d .erl .m .PHONY: all subdirs depend install uninstall clean distclean @@ -87,9 +82,7 @@ ${DIR_LEAVE}; \ done -depend-hook: - -depend: depend-hook +depend: pre-depend regen=0; \ for i in ${SRCS}; do [ $$i -nt .deps ] && regen=1; done; \ if [ $$regen = 1 ]; then \ @@ -102,9 +95,11 @@ done; \ fi +pre-depend: + ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${LINK_STATUS} - if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${RPATH}; then \ + if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ ${LINK_OK}; \ else \ ${LINK_FAILED}; \
--- a/extra.mk.in Thu Sep 20 23:09:16 2007 +0300 +++ b/extra.mk.in Fri Sep 21 15:18:09 2007 +0200 @@ -3,7 +3,6 @@ srcdir ?= @srcdir@ top_srcdir ?= @top_srcdir@ VPATH ?= @srcdir@ -pkgdatadir ?= $(datadir)/@PACKAGE@ pkglibdir ?= $(libdir)/@PACKAGE@ pkgincludedir ?= $(includedir)/@PACKAGE@ top_builddir ?= .
--- a/m4/sharedlib.m4 Thu Sep 20 23:09:16 2007 +0300 +++ b/m4/sharedlib.m4 Fri Sep 21 15:18:09 2007 +0200 @@ -53,7 +53,7 @@ AC_MSG_RESULT(Solaris) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' - LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}' + LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR} -Wl,-R ${libdir}' LIB_PREFIX='lib' LIB_SUFFIX='.so' PLUGIN_CPPFLAGS='-DPIC' @@ -81,7 +81,7 @@ AC_MSG_RESULT(POSIX) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' - LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0' + LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0 -Wl,-R ${libdir}' LIB_PREFIX='lib' LIB_SUFFIX='.so' PLUGIN_CPPFLAGS='-DPIC'
--- a/src/audacious/Makefile Thu Sep 20 23:09:16 2007 +0300 +++ b/src/audacious/Makefile Fri Sep 21 15:18:09 2007 +0200 @@ -166,7 +166,7 @@ LIBS += -L../libaudclient -laudclient endif -depend-hook: ${DBUS_BINDINGS} +pre-depend: ${DBUS_BINDINGS} CPPFLAGS += -DHAVE_CONFIG_H \ ${MOWGLI_CFLAGS} \
--- a/src/libaudclient/Makefile Thu Sep 20 23:09:16 2007 +0300 +++ b/src/libaudclient/Makefile Fri Sep 21 15:18:09 2007 +0200 @@ -9,7 +9,7 @@ include ../../buildsys.mk include ../../extra.mk -depend-hook: +pre-depend: cd ../audacious; make dbus-client-bindings.h CPPFLAGS = ${LIB_CPPFLAGS} ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../.. -I../intl