Mercurial > audlegacy
diff buildsys.mk.in @ 3586:ddb15c329985 trunk
Update audacious to latest rev of build system.
All projects are in sync with the buildsys once again :).
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Fri, 21 Sep 2007 15:17:48 +0200 |
| parents | 021005bfab68 |
| children | 85a49369c95f |
line wrap: on
line diff
--- a/buildsys.mk.in Wed Sep 19 21:06:52 2007 +0300 +++ b/buildsys.mk.in Fri Sep 21 15:17:48 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}; \
