Mercurial > audlegacy
changeset 2691:ecfb79d60c3a trunk
[svn] maintenance of build system:
- LIBDEP macro has been introduced as like audacious plugins r1888.
- make rules such as $(AR) cq $@ $(OBJECTS) in individual Makefile have been removed. these linkage will be done through objective.mk.
| author | yaz |
|---|---|
| date | Mon, 30 Apr 2007 20:49:38 -0700 |
| parents | 62579e205746 |
| children | 6abffd68fa59 |
| files | ChangeLog mk/objective.mk src/audacious/Makefile src/audacious/build_stamp.c src/audacious/widgets/Makefile src/intl/Makefile src/libguess/Makefile src/librcd/Makefile |
| diffstat | 8 files changed, 13 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 27 10:22:03 2007 -0700 +++ b/ChangeLog Mon Apr 30 20:49:38 2007 -0700 @@ -1,3 +1,11 @@ +2007-04-27 17:22:03 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> + revision [4406] + - temporal workaround for a bug which introduced in r4360. without this patch, cuesheet plugin endlessly adds entries in a cue sheet to the current playlist. + + trunk/src/audacious/playlist.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + + 2007-04-22 09:56:17 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4404] - update Welsh translation
--- a/mk/objective.mk Fri Apr 27 10:22:03 2007 -0700 +++ b/mk/objective.mk Mon Apr 30 20:49:38 2007 -0700 @@ -223,7 +223,7 @@ fi;) \ fi -%.a: $(OBJECTS) +$(OBJECTIVE_LIBS_NOINST): $(OBJECTS) if [ "x$(OBJECTS)" != "x" ]; then \ $(MAKE) $(OBJECTS) || exit; \ printf "%10s %-20s\n" LINK $@; \
--- a/src/audacious/Makefile Fri Apr 27 10:22:03 2007 -0700 +++ b/src/audacious/Makefile Mon Apr 30 20:49:38 2007 -0700 @@ -110,10 +110,12 @@ OBJECTS = ${SOURCES:.c=.o} +LIBDEP = widgets/libwidgets.a ../libguess/libguess.a ../librcd/librcd.a + desktop_DATA = audacious.desktop desktopdir = $(datadir)/applications -audacious: $(OBJECTS) widgets/libwidgets.a +audacious: $(OBJECTS) $(LIBDEP) $(CXX) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ @printf "%10s %-20s\n" LINK $@
--- a/src/audacious/build_stamp.c Fri Apr 27 10:22:03 2007 -0700 +++ b/src/audacious/build_stamp.c Mon Apr 30 20:49:38 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070422-4404"; +const gchar *svn_stamp = "20070427-4406";
--- a/src/audacious/widgets/Makefile Fri Apr 27 10:22:03 2007 -0700 +++ b/src/audacious/widgets/Makefile Mon Apr 30 20:49:38 2007 -0700 @@ -39,6 +39,3 @@ OBJECTS = ${SOURCES:.c=.o} include ../../../mk/objective.mk - -libwidgets.a: $(OBJECTS) - $(AR) cr $@ $(OBJECTS)
--- a/src/intl/Makefile Fri Apr 27 10:22:03 2007 -0700 +++ b/src/intl/Makefile Mon Apr 30 20:49:38 2007 -0700 @@ -44,6 +44,3 @@ OBJECTS = ${SOURCES:.c=.o} include ../../mk/objective.mk - -libintl.a: $(OBJECTS) - $(AR) cr $@ $(OBJECTS)
--- a/src/libguess/Makefile Fri Apr 27 10:22:03 2007 -0700 +++ b/src/libguess/Makefile Mon Apr 30 20:49:38 2007 -0700 @@ -14,7 +14,3 @@ OBJECTS = ${SOURCES:.c=.o} include ../../mk/objective.mk - -libguess.a: $(OBJECTS) - $(AR) cq $@ $(OBJECTS) -
--- a/src/librcd/Makefile Fri Apr 27 10:22:03 2007 -0700 +++ b/src/librcd/Makefile Mon Apr 30 20:49:38 2007 -0700 @@ -2,7 +2,6 @@ include ../../mk/init.mk OBJECTIVE_LIBS_NOINST = librcd.a -OBJECTIVE_SONAME_SUFFIX = 0.1.8 LDFLAGS += -Wl,-export-dynamic @@ -14,6 +13,3 @@ OBJECTS = ${SOURCES:.c=.o} include ../../mk/objective.mk - -librcd.a: $(OBJECTS) - $(AR) cq $@ $(OBJECTS)