Mercurial > audlegacy
changeset 3585:8e50c2cd44f0 trunk
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 20 Sep 2007 23:09:16 +0300 |
| parents | 4f99a9e270cf (current diff) 4ee9f4c9f905 (diff) |
| children | ed6ec0e94afc 9197ea39a08a |
| files | icons/.depend icons/.depend-done icons/Makefile icons/audacious.png skins/Classic/.depend skins/Classic/.depend-done skins/Classic/Makefile skins/Classic/balance.png skins/Classic/cbuttons.png skins/Classic/eq_ex.png skins/Classic/eqmain.png skins/Classic/main.png skins/Classic/monoster.png skins/Classic/nums_ex.png skins/Classic/playpaus.png skins/Classic/pledit.png skins/Classic/pledit.txt skins/Classic/posbar.png skins/Classic/shufrep.png skins/Classic/skin-classic.hints skins/Classic/skin.hints skins/Classic/text.png skins/Classic/titlebar.png skins/Classic/viscolor.txt skins/Classic/volume.png skins/Default/.depend skins/Default/.depend-done skins/Default/Makefile skins/Default/balance.png skins/Default/cbuttons.png skins/Default/eq_ex.png skins/Default/eqmain.png skins/Default/main.png skins/Default/monoster.png skins/Default/nums_ex.png skins/Default/playpaus.png skins/Default/pledit.png skins/Default/pledit.txt skins/Default/posbar.png skins/Default/shufrep.png skins/Default/skin-classic.hints skins/Default/skin.hints skins/Default/text.png skins/Default/titlebar.png skins/Default/viscolor.txt skins/Default/volume.png skins/Ivory/.depend skins/Ivory/.depend-done skins/Ivory/Makefile skins/Ivory/balance.png skins/Ivory/cbuttons.png skins/Ivory/eq_ex.png skins/Ivory/eqmain.png skins/Ivory/main.png skins/Ivory/monoster.png skins/Ivory/nums_ex.png skins/Ivory/playpaus.png skins/Ivory/pledit.png skins/Ivory/pledit.txt skins/Ivory/posbar.png skins/Ivory/shufrep.png skins/Ivory/skin.hints skins/Ivory/text.png skins/Ivory/titlebar.png skins/Ivory/viscolor.txt skins/Ivory/volume.png skins/Makefile skins/Osmosis/.depend skins/Osmosis/.depend-done skins/Osmosis/Makefile skins/Osmosis/balance.png skins/Osmosis/cbuttons.png skins/Osmosis/eq_ex.png skins/Osmosis/eqmain.png skins/Osmosis/main.png skins/Osmosis/monoster.png skins/Osmosis/nums_ex.png skins/Osmosis/playpaus.png skins/Osmosis/pledit.png skins/Osmosis/pledit.txt skins/Osmosis/posbar.png skins/Osmosis/shufrep.png skins/Osmosis/skin.hints skins/Osmosis/text.png skins/Osmosis/titlebar.png skins/Osmosis/viscolor.txt skins/Osmosis/volume.png skins/TinyPlayer/.depend skins/TinyPlayer/.depend-done skins/TinyPlayer/Makefile skins/TinyPlayer/balance.png skins/TinyPlayer/cbuttons.png skins/TinyPlayer/eq_ex.png skins/TinyPlayer/eqmain.png skins/TinyPlayer/main.png skins/TinyPlayer/monoster.png skins/TinyPlayer/nums_ex.png skins/TinyPlayer/playpaus.png skins/TinyPlayer/pledit.png skins/TinyPlayer/pledit.txt skins/TinyPlayer/posbar.png skins/TinyPlayer/shufrep.png skins/TinyPlayer/skin.hints skins/TinyPlayer/text.png skins/TinyPlayer/titlebar.png skins/TinyPlayer/viscolor.txt skins/TinyPlayer/volume.png src/audacious/glade/Makefile src/audacious/images/Makefile src/audacious/ui/Makefile |
| diffstat | 198 files changed, 790 insertions(+), 921 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,31 @@ +syntax: glob +aclocal.m4 +autom4te.cache +audacious.pc +audclient.pc +buildsys.mk +config.h +config.h.in +config.log +config.status +configure +extra.mk +man/audacious.1 +man/audtool.1 +po/Makefile +po/Makefile.in +po/POTFILES +po/stamp-po +src/audacious/audacious +src/audacious/audacious.desktop +src/audacious/build_stamp.c +src/audacious/dbus-client-bindings.h +src/audacious/dbus-server-bindings.h +src/audtool/audtool +.deps +*.a +*.dylib +*.gmo +*.o +*.so +*~
--- a/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,16 +1,97 @@ +SUBDIRS = src man pixmaps po +DATA = Skins/Classic/balance.png \ + Skins/Classic/cbuttons.png \ + Skins/Classic/eq_ex.png \ + Skins/Classic/eqmain.png \ + Skins/Classic/main.png \ + Skins/Classic/monoster.png \ + Skins/Classic/nums_ex.png \ + Skins/Classic/playpaus.png \ + Skins/Classic/pledit.png \ + Skins/Classic/pledit.txt \ + Skins/Classic/posbar.png \ + Skins/Classic/shufrep.png \ + Skins/Classic/skin-classic.hints \ + Skins/Classic/skin.hints \ + Skins/Classic/text.png \ + Skins/Classic/titlebar.png \ + Skins/Classic/viscolor.txt \ + Skins/Classic/volume.png \ + Skins/Default/balance.png \ + Skins/Default/cbuttons.png \ + Skins/Default/eq_ex.png \ + Skins/Default/eqmain.png \ + Skins/Default/main.png \ + Skins/Default/monoster.png \ + Skins/Default/nums_ex.png \ + Skins/Default/playpaus.png \ + Skins/Default/pledit.png \ + Skins/Default/pledit.txt \ + Skins/Default/posbar.png \ + Skins/Default/shufrep.png \ + Skins/Default/skin-classic.hints \ + Skins/Default/skin.hints \ + Skins/Default/text.png \ + Skins/Default/titlebar.png \ + Skins/Default/viscolor.txt \ + Skins/Default/volume.png \ + Skins/Ivory/balance.png \ + Skins/Ivory/cbuttons.png \ + Skins/Ivory/eq_ex.png \ + Skins/Ivory/eqmain.png \ + Skins/Ivory/main.png \ + Skins/Ivory/monoster.png \ + Skins/Ivory/nums_ex.png \ + Skins/Ivory/playpaus.png \ + Skins/Ivory/pledit.png \ + Skins/Ivory/pledit.txt \ + Skins/Ivory/posbar.png \ + Skins/Ivory/shufrep.png \ + Skins/Ivory/skin.hints \ + Skins/Ivory/text.png \ + Skins/Ivory/titlebar.png \ + Skins/Ivory/viscolor.txt \ + Skins/Ivory/volume.png \ + Skins/Osmosis/balance.png \ + Skins/Osmosis/cbuttons.png \ + Skins/Osmosis/eq_ex.png \ + Skins/Osmosis/eqmain.png \ + Skins/Osmosis/main.png \ + Skins/Osmosis/monoster.png \ + Skins/Osmosis/nums_ex.png \ + Skins/Osmosis/playpaus.png \ + Skins/Osmosis/pledit.png \ + Skins/Osmosis/pledit.txt \ + Skins/Osmosis/posbar.png \ + Skins/Osmosis/shufrep.png \ + Skins/Osmosis/skin.hints \ + Skins/Osmosis/text.png \ + Skins/Osmosis/titlebar.png \ + Skins/Osmosis/viscolor.txt \ + Skins/Osmosis/volume.png \ + Skins/TinyPlayer/balance.png \ + Skins/TinyPlayer/cbuttons.png \ + Skins/TinyPlayer/eq_ex.png \ + Skins/TinyPlayer/eqmain.png \ + Skins/TinyPlayer/main.png \ + Skins/TinyPlayer/monoster.png \ + Skins/TinyPlayer/nums_ex.png \ + Skins/TinyPlayer/playpaus.png \ + Skins/TinyPlayer/pledit.png \ + Skins/TinyPlayer/pledit.txt \ + Skins/TinyPlayer/posbar.png \ + Skins/TinyPlayer/shufrep.png \ + Skins/TinyPlayer/skin.hints \ + Skins/TinyPlayer/text.png \ + Skins/TinyPlayer/titlebar.png \ + Skins/TinyPlayer/viscolor.txt \ + Skins/TinyPlayer/volume.png DISTCLEAN = extra.mk include buildsys.mk -SUBDIRS = src man po icons skins - -OBJECTIVE_DATA = \ - audacious.pc:$(LIBDIR)/pkgconfig \ - audclient.pc:$(LIBDIR)/pkgconfig - install-extra: - y="audacious.pc audclient.pc"; \ - for i in $$y; do \ + for i in audacious.pc audclient.pc; do \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${DESTDIR}${libdir}/pkgconfig && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/pkgconfig/$$i; then \ ${INSTALL_OK}; \ @@ -20,8 +101,7 @@ done uninstall-extra: - y="audacious.pc audclient.pc"; \ - for i in $$y; do \ + for i in audacious.pc audclient.pc; do \ if [ -f ${DESTDIR}${libdir}/pkgconfig/$$i ]; then \ if rm -f ${DESTDIR}${libdir}/pkgconfig/$$i; then \ ${DELETE_OK}; \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/pledit.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/skin-classic.hints Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,3 @@ +[skin] +skinDescription=The default skin for Audacious. (Classic variant) +mainwinOthertext=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/skin.hints Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,7 @@ +[skin] +skinDescription=The default skin for Audacious. +mainwinOthertext=1 +mainwinOthertextVisible=1 +mainwinTextVisible=1 +mainwinVisVisible=1 +mainwinMenurowVisible=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Classic/viscolor.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +126,126,126 // [osc 1] +126,126,126 // [osc 2] +126,126,126 // [osc 3] +126,126,126 // [osc 4] +126,126,126 // [osc 5] +130,130,131 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/pledit.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/skin-classic.hints Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,3 @@ +[skin] +skinDescription=The default skin for Audacious. (Classic variant) +mainwinOthertext=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/skin.hints Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,28 @@ +[skin] +skinDescription=The default skin for Audacious. +mainwinOthertext=1 +mainwinVisX=19 +mainwinVisY=39 +mainwinTextX=19 +mainwinTextY=26 +mainwinTextWidth=246 +mainwinInfobarX=111 +mainwinInfobarY=42 +mainwinNumber0X=30 +mainwinNumber0Y=56 +mainwinNumber1X=42 +mainwinNumber1Y=56 +mainwinNumber2X=54 +mainwinNumber2Y=56 +mainwinNumber3X=72 +mainwinNumber3Y=56 +mainwinNumber4X=84 +mainwinNumber4Y=56 +mainwinPlayStatusX=19 +mainwinPlayStatusY=58 +mainwinMenurowVisible=1 +mainwinOthertextIsStatus=1 +mainwinOthertextVisible=1 +mainwinTextVisible=1 +mainwinVisVisible=1 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Default/viscolor.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +9,13,15 +19,26,31 +29,39,47 +39,52,63 +49,65,79 +59,78,95 +69,91,111 +79,105,127 +88,118,143 +98,131,159 +108,144,175 +118,157,191 +128,170,207 +138,183,223 +148,196,239 +158,210,255 +240,240,240 // [osc 1] +220,220,220 // [osc 2] +170,170,170 // [osc 3] +100,100,100 // [osc 4] +20,20,20 // [osc 5] +200,200,220 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Ivory/pledit.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#325e84 +Current=#111111 +NormalBG=#FFFFFF +SelectedBG=#999999 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Ivory/skin.hints Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,64 @@ +[skin] +skinDescription=Ivory +mainwinOthertext=1 +mainwinVisX=335 +mainwinVisY=53 +mainwinTextX=93 +mainwinTextY=42 +mainwinTextWidth=319 +mainwinInfobarX=173 +mainwinInfobarY=64 +mainwinNumber0X=105 +mainwinNumber0Y=57 +mainwinNumber1X=117 +mainwinNumber1Y=57 +mainwinNumber2X=129 +mainwinNumber2Y=57 +mainwinNumber3X=147 +mainwinNumber3Y=57 +mainwinNumber4X=159 +mainwinNumber4Y=57 +mainwinPlayStatusX=93 +mainwinPlayStatusY=60 +mainwinOthertextIsStatus=1 +mainwinVolumeX=126 +mainwinVolumeY=22 +mainwinBalanceX=200 +mainwinBalanceY=22 +mainwinPositionX=130 +mainwinPositionY=80 +mainwinTextVisible=1 +mainwinOthertextVisible=1 +mainwinVisVisible=1 +mainwinMenurowVisible=0 +mainwinWidth=425 +mainwinHeight=100 +mainwinPreviousX=5 +mainwinPreviousY=48 +mainwinPlayX=33 +mainwinPlayY=48 +mainwinPauseX=33 +mainwinPauseY=70 +mainwinStopX=33 +mainwinStopY=26 +mainwinNextX=61 +mainwinNextY=48 +mainwinEjectX=390 +mainwinEjectY=77 +mainwinEQButtonX=249 +mainwinEQButtonY=22 +mainwinPLButtonX=272 +mainwinPLButtonY=22 +mainwinShuffleX=355 +mainwinShuffleY=20 +mainwinRepeatX=400 +mainwinRepeatY=20 +mainwinAboutX=999 +mainwinAboutY=999 +mainwinMinimizeX=393 +mainwinMinimizeY=3 +mainwinShadeX=403 +mainwinShadeY=3 +mainwinCloseX=413 +mainwinCloseY=3 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Ivory/viscolor.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,25 @@ +255,255,255 // [background color 1] +255,255,255 // [background color 2] +255,255,255 +240,242,244 +226,230,234 +212,218,223 +198,205,213 +184,193,203 +170,181,192 +156,168,182 +142,156,172 +128,144,161 +114,131,151 +100,119,140 +86,107,130 +72,94,120 +58,82,109 +44,70,99 +30,58,89 +129,129,129 // [osc 1] +150,150,150 // [osc 2] +170,170,170 // [osc 3] +200,200,200 // [osc 4] +240,240,240 // [osc 5] +125,125,124 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Osmosis/pledit.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Osmosis/skin.hints Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,64 @@ +[skin] +skinDescription=Osmosis +mainwinOthertext=1 +mainwinVisX=335 +mainwinVisY=53 +mainwinTextX=93 +mainwinTextY=42 +mainwinTextWidth=319 +mainwinInfobarX=173 +mainwinInfobarY=64 +mainwinNumber0X=105 +mainwinNumber0Y=57 +mainwinNumber1X=117 +mainwinNumber1Y=57 +mainwinNumber2X=129 +mainwinNumber2Y=57 +mainwinNumber3X=147 +mainwinNumber3Y=57 +mainwinNumber4X=159 +mainwinNumber4Y=57 +mainwinPlayStatusX=93 +mainwinPlayStatusY=60 +mainwinOthertextIsStatus=1 +mainwinVolumeX=126 +mainwinVolumeY=22 +mainwinBalanceX=200 +mainwinBalanceY=22 +mainwinPositionX=130 +mainwinPositionY=80 +mainwinTextVisible=1 +mainwinOthertextVisible=1 +mainwinVisVisible=1 +mainwinMenurowVisible=0 +mainwinWidth=425 +mainwinHeight=100 +mainwinPreviousX=5 +mainwinPreviousY=48 +mainwinPlayX=33 +mainwinPlayY=48 +mainwinPauseX=33 +mainwinPauseY=70 +mainwinStopX=33 +mainwinStopY=26 +mainwinNextX=61 +mainwinNextY=48 +mainwinEjectX=390 +mainwinEjectY=77 +mainwinEQButtonX=249 +mainwinEQButtonY=22 +mainwinPLButtonX=272 +mainwinPLButtonY=22 +mainwinShuffleX=355 +mainwinShuffleY=20 +mainwinRepeatX=400 +mainwinRepeatY=20 +mainwinAboutX=999 +mainwinAboutY=999 +mainwinMinimizeX=393 +mainwinMinimizeY=3 +mainwinShadeX=403 +mainwinShadeY=3 +mainwinCloseX=413 +mainwinCloseY=3 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/Osmosis/viscolor.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +126,126,126 // [osc 1] +126,126,126 // [osc 2] +126,126,126 // [osc 3] +126,126,126 // [osc 4] +126,126,126 // [osc 5] +130,130,131 // [peak color]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/TinyPlayer/pledit.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,6 @@ +[Text] +Normal=#a6c1df +Current=#eeeeee +NormalBG=#000000 +SelectedBG=#666666 +Font=Helvetica
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/TinyPlayer/skin.hints Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,57 @@ +[skin] +skinDescription=TinyPlayer skin +mainwinOthertext=1 +mainwinVisX=189 +mainwinVisY=36 +mainwinTextX=1 +mainwinTextY=80 +mainwinTextWidth=273 +mainwinInfobarX=0 +mainwinInfobarY=0 +mainwinNumber0X=30 +mainwinNumber0Y=19 +mainwinNumber1X=42 +mainwinNumber1Y=19 +mainwinNumber2X=54 +mainwinNumber2Y=19 +mainwinNumber3X=72 +mainwinNumber3Y=19 +mainwinNumber4X=84 +mainwinNumber4Y=19 +mainwinPlayStatusX=11 +mainwinPlayStatusY=22 +mainwinOthertextIsStatus=0 +mainwinVolumeX=106 +mainwinVolumeY=22 +mainwinBalanceX=180 +mainwinBalanceY=22 +mainwinPositionX=16 +mainwinPositionY=36 +mainwinTextVisible=1 +mainwinOthertextVisible=0 +mainwinVisVisible=0 +mainwinMenurowVisible=0 +mainwinWidth=275 +mainwinHeight=87 +mainwinPreviousX=16 +mainwinPreviousY=53 +mainwinPlayX=39 +mainwinPlayY=53 +mainwinPauseX=62 +mainwinPauseY=53 +mainwinStopX=85 +mainwinStopY=53 +mainwinNextX=108 +mainwinNextY=53 +mainwinEjectX=136 +mainwinEjectY=53 +mainwinEQButtonX=219 +mainwinEQButtonY=22 +mainwinPLButtonX=242 +mainwinPLButtonY=22 +mainwinShuffleX=164 +mainwinShuffleY=56 +mainwinRepeatX=210 +mainwinRepeatY=56 +mainwinAboutX=247 +mainwinAboutY=53
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Skins/TinyPlayer/viscolor.txt Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,24 @@ +0,0,0 // [background color 1] +0,0,0 // [background color 2] +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +128,170,206 +126,126,126 // [osc 1] +126,126,126 // [osc 2] +126,126,126 // [osc 3] +126,126,126 // [osc 4] +126,126,126 // [osc 5] +130,130,131 // [peak color]
--- a/buildsys.mk.in Wed Sep 19 17:47:30 2007 +0300 +++ b/buildsys.mk.in Thu Sep 20 23:09:16 2007 +0300 @@ -83,7 +83,7 @@ subdirs: for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} || exit 1; \ + ${MAKE} ${MFLAGS} || exit 1; \ ${DIR_LEAVE}; \ done @@ -187,7 +187,7 @@ install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} install || exit 1; \ + ${MAKE} ${MFLAGS} install || exit 1; \ ${DIR_LEAVE}; \ done @@ -220,7 +220,7 @@ for i in ${DATA}; do \ ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${datadir} && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ + if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ @@ -259,7 +259,7 @@ uninstall: uninstall-extra for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} uninstall || exit 1; \ + ${MAKE} ${MFLAGS} uninstall || exit 1; \ ${DIR_LEAVE}; \ done @@ -340,7 +340,7 @@ clean: for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} clean || exit 1; \ + ${MAKE} ${MFLAGS} clean || exit 1; \ ${DIR_LEAVE}; \ done @@ -357,7 +357,7 @@ distclean: clean for i in ${SUBDIRS}; do \ ${DIR_ENTER}; \ - ${MAKE} distclean || exit 1; \ + ${MAKE} ${MFLAGS} distclean || exit 1; \ ${DIR_LEAVE}; \ done
--- a/icons/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../buildsys.mk - -pixmapsdir = $(datadir)/pixmaps - -install-extra: - y="audacious.png"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${pixmapsdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${pixmapsdir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="audacious.png"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${pixmapsdir}/$$i ]; then \ - if rm -f ${DESTDIR}${pixmapsdir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pixmaps/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -0,0 +1,5 @@ +DATA = audacious.png + +include ../buildsys.mk + +PACKAGE = pixmaps
--- a/skins/Classic/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Classic - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Classic/pledit.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/Classic/skin-classic.hints Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. (Classic variant) -mainwinOthertext=1
--- a/skins/Classic/skin.hints Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. -mainwinOthertext=1 -mainwinOthertextVisible=1 -mainwinTextVisible=1 -mainwinVisVisible=1 -mainwinMenurowVisible=1
--- a/skins/Classic/viscolor.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -126,126,126 // [osc 1] -126,126,126 // [osc 2] -126,126,126 // [osc 3] -126,126,126 // [osc 4] -126,126,126 // [osc 5] -130,130,131 // [peak color]
--- a/skins/Default/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Default - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Default/pledit.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/Default/skin-classic.hints Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. (Classic variant) -mainwinOthertext=1
--- a/skins/Default/skin.hints Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -[skin] -skinDescription=The default skin for Audacious. -mainwinOthertext=1 -mainwinVisX=19 -mainwinVisY=39 -mainwinTextX=19 -mainwinTextY=26 -mainwinTextWidth=246 -mainwinInfobarX=111 -mainwinInfobarY=42 -mainwinNumber0X=30 -mainwinNumber0Y=56 -mainwinNumber1X=42 -mainwinNumber1Y=56 -mainwinNumber2X=54 -mainwinNumber2Y=56 -mainwinNumber3X=72 -mainwinNumber3Y=56 -mainwinNumber4X=84 -mainwinNumber4Y=56 -mainwinPlayStatusX=19 -mainwinPlayStatusY=58 -mainwinMenurowVisible=1 -mainwinOthertextIsStatus=1 -mainwinOthertextVisible=1 -mainwinTextVisible=1 -mainwinVisVisible=1 -
--- a/skins/Default/viscolor.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -9,13,15 -19,26,31 -29,39,47 -39,52,63 -49,65,79 -59,78,95 -69,91,111 -79,105,127 -88,118,143 -98,131,159 -108,144,175 -118,157,191 -128,170,207 -138,183,223 -148,196,239 -158,210,255 -240,240,240 // [osc 1] -220,220,220 // [osc 2] -170,170,170 // [osc 3] -100,100,100 // [osc 4] -20,20,20 // [osc 5] -200,200,220 // [peak color]
--- a/skins/Ivory/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Ivory - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Ivory/pledit.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#325e84 -Current=#111111 -NormalBG=#FFFFFF -SelectedBG=#999999 -Font=Helvetica
--- a/skins/Ivory/skin.hints Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -[skin] -skinDescription=Ivory -mainwinOthertext=1 -mainwinVisX=335 -mainwinVisY=53 -mainwinTextX=93 -mainwinTextY=42 -mainwinTextWidth=319 -mainwinInfobarX=173 -mainwinInfobarY=64 -mainwinNumber0X=105 -mainwinNumber0Y=57 -mainwinNumber1X=117 -mainwinNumber1Y=57 -mainwinNumber2X=129 -mainwinNumber2Y=57 -mainwinNumber3X=147 -mainwinNumber3Y=57 -mainwinNumber4X=159 -mainwinNumber4Y=57 -mainwinPlayStatusX=93 -mainwinPlayStatusY=60 -mainwinOthertextIsStatus=1 -mainwinVolumeX=126 -mainwinVolumeY=22 -mainwinBalanceX=200 -mainwinBalanceY=22 -mainwinPositionX=130 -mainwinPositionY=80 -mainwinTextVisible=1 -mainwinOthertextVisible=1 -mainwinVisVisible=1 -mainwinMenurowVisible=0 -mainwinWidth=425 -mainwinHeight=100 -mainwinPreviousX=5 -mainwinPreviousY=48 -mainwinPlayX=33 -mainwinPlayY=48 -mainwinPauseX=33 -mainwinPauseY=70 -mainwinStopX=33 -mainwinStopY=26 -mainwinNextX=61 -mainwinNextY=48 -mainwinEjectX=390 -mainwinEjectY=77 -mainwinEQButtonX=249 -mainwinEQButtonY=22 -mainwinPLButtonX=272 -mainwinPLButtonY=22 -mainwinShuffleX=355 -mainwinShuffleY=20 -mainwinRepeatX=400 -mainwinRepeatY=20 -mainwinAboutX=999 -mainwinAboutY=999 -mainwinMinimizeX=393 -mainwinMinimizeY=3 -mainwinShadeX=403 -mainwinShadeY=3 -mainwinCloseX=413 -mainwinCloseY=3 -
--- a/skins/Ivory/viscolor.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -255,255,255 // [background color 1] -255,255,255 // [background color 2] -255,255,255 -240,242,244 -226,230,234 -212,218,223 -198,205,213 -184,193,203 -170,181,192 -156,168,182 -142,156,172 -128,144,161 -114,131,151 -100,119,140 -86,107,130 -72,94,120 -58,82,109 -44,70,99 -30,58,89 -129,129,129 // [osc 1] -150,150,150 // [osc 2] -170,170,170 // [osc 3] -200,200,200 // [osc 4] -240,240,240 // [osc 5] -125,125,124 // [peak color]
--- a/skins/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -include ../buildsys.mk - -SUBDIRS = Default Classic TinyPlayer Osmosis Ivory -
--- a/skins/Osmosis/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/Osmosis - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/Osmosis/pledit.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/Osmosis/skin.hints Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -[skin] -skinDescription=Osmosis -mainwinOthertext=1 -mainwinVisX=335 -mainwinVisY=53 -mainwinTextX=93 -mainwinTextY=42 -mainwinTextWidth=319 -mainwinInfobarX=173 -mainwinInfobarY=64 -mainwinNumber0X=105 -mainwinNumber0Y=57 -mainwinNumber1X=117 -mainwinNumber1Y=57 -mainwinNumber2X=129 -mainwinNumber2Y=57 -mainwinNumber3X=147 -mainwinNumber3Y=57 -mainwinNumber4X=159 -mainwinNumber4Y=57 -mainwinPlayStatusX=93 -mainwinPlayStatusY=60 -mainwinOthertextIsStatus=1 -mainwinVolumeX=126 -mainwinVolumeY=22 -mainwinBalanceX=200 -mainwinBalanceY=22 -mainwinPositionX=130 -mainwinPositionY=80 -mainwinTextVisible=1 -mainwinOthertextVisible=1 -mainwinVisVisible=1 -mainwinMenurowVisible=0 -mainwinWidth=425 -mainwinHeight=100 -mainwinPreviousX=5 -mainwinPreviousY=48 -mainwinPlayX=33 -mainwinPlayY=48 -mainwinPauseX=33 -mainwinPauseY=70 -mainwinStopX=33 -mainwinStopY=26 -mainwinNextX=61 -mainwinNextY=48 -mainwinEjectX=390 -mainwinEjectY=77 -mainwinEQButtonX=249 -mainwinEQButtonY=22 -mainwinPLButtonX=272 -mainwinPLButtonY=22 -mainwinShuffleX=355 -mainwinShuffleY=20 -mainwinRepeatX=400 -mainwinRepeatY=20 -mainwinAboutX=999 -mainwinAboutY=999 -mainwinMinimizeX=393 -mainwinMinimizeY=3 -mainwinShadeX=403 -mainwinShadeY=3 -mainwinCloseX=413 -mainwinCloseY=3 -
--- a/skins/Osmosis/viscolor.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -126,126,126 // [osc 1] -126,126,126 // [osc 2] -126,126,126 // [osc 3] -126,126,126 // [osc 4] -126,126,126 // [osc 5] -130,130,131 // [peak color]
--- a/skins/TinyPlayer/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../buildsys.mk - -skindir = $(pkgdatadir)/Skins/TinyPlayer - -install-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.txt *.hints"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${skindir}/$$i ]; then \ - if rm -f ${DESTDIR}${skindir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done
--- a/skins/TinyPlayer/pledit.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -[Text] -Normal=#a6c1df -Current=#eeeeee -NormalBG=#000000 -SelectedBG=#666666 -Font=Helvetica
--- a/skins/TinyPlayer/skin.hints Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -[skin] -skinDescription=TinyPlayer skin -mainwinOthertext=1 -mainwinVisX=189 -mainwinVisY=36 -mainwinTextX=1 -mainwinTextY=80 -mainwinTextWidth=273 -mainwinInfobarX=0 -mainwinInfobarY=0 -mainwinNumber0X=30 -mainwinNumber0Y=19 -mainwinNumber1X=42 -mainwinNumber1Y=19 -mainwinNumber2X=54 -mainwinNumber2Y=19 -mainwinNumber3X=72 -mainwinNumber3Y=19 -mainwinNumber4X=84 -mainwinNumber4Y=19 -mainwinPlayStatusX=11 -mainwinPlayStatusY=22 -mainwinOthertextIsStatus=0 -mainwinVolumeX=106 -mainwinVolumeY=22 -mainwinBalanceX=180 -mainwinBalanceY=22 -mainwinPositionX=16 -mainwinPositionY=36 -mainwinTextVisible=1 -mainwinOthertextVisible=0 -mainwinVisVisible=0 -mainwinMenurowVisible=0 -mainwinWidth=275 -mainwinHeight=87 -mainwinPreviousX=16 -mainwinPreviousY=53 -mainwinPlayX=39 -mainwinPlayY=53 -mainwinPauseX=62 -mainwinPauseY=53 -mainwinStopX=85 -mainwinStopY=53 -mainwinNextX=108 -mainwinNextY=53 -mainwinEjectX=136 -mainwinEjectY=53 -mainwinEQButtonX=219 -mainwinEQButtonY=22 -mainwinPLButtonX=242 -mainwinPLButtonY=22 -mainwinShuffleX=164 -mainwinShuffleY=56 -mainwinRepeatX=210 -mainwinRepeatY=56 -mainwinAboutX=247 -mainwinAboutY=53
--- a/skins/TinyPlayer/viscolor.txt Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -0,0,0 // [background color 1] -0,0,0 // [background color 2] -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -128,170,206 -126,126,126 // [osc 1] -126,126,126 // [osc 2] -126,126,126 // [osc 3] -126,126,126 // [osc 4] -126,126,126 // [osc 5] -130,130,131 // [peak color]
--- a/src/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/src/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,14 +1,9 @@ -.SILENT: +SUBDIRS = libguess audacious libid3tag include ../extra.mk -SUBDIRS = libguess - ifdef USE_DBUS -SUBDIRS += libaudclient audtool +SUBDIRS := libaudclient audtool $(SUBDIRS) endif -SUBDIRS += audacious libid3tag - include ../buildsys.mk -
--- a/src/audacious/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/src/audacious/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,172 +1,196 @@ include ../../extra.mk -SUBDIRS = $(INTL_OBJECTIVE) glade images ui +SUBDIRS = ${INTL_OBJECTIVE} PROG = audacious - -LDFLAGS += $(AUDLDFLAGS) - -INCLUDES = \ - auddrct.h \ - configdb.h \ - custom_uri.h \ - dbus.h \ - discovery.h \ - dbus-service.h \ - eventqueue.h \ - flow.h \ - formatter.h \ - rcfile.h \ - i18n.h \ - input.h \ - hook.h \ - main.h \ - mime.h \ - output.h \ - playback.h \ - playlist.h \ - playlist_container.h \ - plugin.h \ - strings.h \ - tuple.h \ - tuple_formatter.h \ - tuple_compiler.h \ - ui_fileinfopopup.h \ - ui_lastfm.h\ - ui_plugin_menu.h \ - ui_preferences.h \ - util.h \ - vfs.h \ - vfs_buffer.h \ - vfs_buffered_file.h \ - xconvert.h - -SRCS = \ - auddrct.c \ - build_stamp.c \ - configdb.c \ - custom_uri.c \ - discovery.c \ - dnd.c \ - dock.c \ - effect.c \ - eventqueue.c \ - fft.c \ - flow.c \ - formatter.c \ - general.c \ - glade.c \ - hints.c \ - hook.c \ - iir.c \ - iir_cfs.c \ - iir_fpu.c \ - input.c \ - logger.c \ - main.c \ - memorypool.c \ - mime.c \ - output.c \ - pixbuf_effects.c \ - playback.c \ - playback_evlisteners.c \ - playlist.c \ - playlist_container.c \ - playlist_evlisteners.c \ - pluginenum.c \ - rcfile.c \ - signals.c \ - strings.c \ - tuple.c \ - tuple_formatter.c \ - tuple_compiler.c \ - skin.c \ - ui_about.c \ - ui_albumart.c \ - ui_credits.c \ - ui_equalizer.c \ - ui_fileinfo.c \ - ui_fileinfopopup.c \ - ui_fileopener.c \ - ui_jumptotrack.c \ - ui_lastfm.c\ - ui_main.c \ - ui_main_evlisteners.c \ - ui_manager.c \ - ui_playlist.c \ - ui_playlist_manager.c \ - ui_preferences.c \ - ui_skinned_cursor.c \ - ui_skinned_window.c \ - ui_skinned_button.c \ - ui_skinned_textbox.c \ - ui_skinned_number.c \ - ui_skinned_horizontal_slider.c \ - ui_vis.c \ - ui_svis.c \ - ui_skinned_menurow.c \ - ui_skinned_playstatus.c \ - ui_skinned_monostereo.c \ - ui_skinned_equalizer_slider.c \ - ui_skinned_equalizer_graph.c \ - ui_skinned_playlist_slider.c \ - ui_skinned_playlist.c \ - ui_skinselector.c \ - ui_urlopener.c \ - util.c \ - vfs.c \ - vfs_buffer.c \ - vfs_buffered_file.c \ - vfs_common.c \ - visualization.c \ - volumecontrol.c \ - sync-menu.c \ - xconvert.c +SRCS = auddrct.c \ + build_stamp.c \ + configdb.c \ + custom_uri.c \ + discovery.c \ + dnd.c \ + dock.c \ + effect.c \ + eventqueue.c \ + fft.c \ + flow.c \ + formatter.c \ + general.c \ + glade.c \ + hints.c \ + hook.c \ + iir.c \ + iir_cfs.c \ + iir_fpu.c \ + input.c \ + logger.c \ + main.c \ + memorypool.c \ + mime.c \ + output.c \ + pixbuf_effects.c \ + playback.c \ + playback_evlisteners.c \ + playlist.c \ + playlist_container.c \ + playlist_evlisteners.c \ + pluginenum.c \ + rcfile.c \ + signals.c \ + strings.c \ + tuple.c \ + tuple_formatter.c \ + tuple_compiler.c \ + skin.c \ + ui_about.c \ + ui_albumart.c \ + ui_credits.c \ + ui_equalizer.c \ + ui_fileinfo.c \ + ui_fileinfopopup.c \ + ui_fileopener.c \ + ui_jumptotrack.c \ + ui_lastfm.c \ + ui_main.c \ + ui_main_evlisteners.c \ + ui_manager.c \ + ui_playlist.c \ + ui_playlist_manager.c \ + ui_preferences.c \ + ui_skinned_cursor.c \ + ui_skinned_window.c \ + ui_skinned_button.c \ + ui_skinned_textbox.c \ + ui_skinned_number.c \ + ui_skinned_horizontal_slider.c \ + ui_vis.c \ + ui_svis.c \ + ui_skinned_menurow.c \ + ui_skinned_playstatus.c \ + ui_skinned_monostereo.c \ + ui_skinned_equalizer_slider.c \ + ui_skinned_equalizer_graph.c \ + ui_skinned_playlist_slider.c \ + ui_skinned_playlist.c \ + ui_skinselector.c \ + ui_urlopener.c \ + util.c \ + vfs.c \ + vfs_buffer.c \ + vfs_buffered_file.c \ + vfs_common.c \ + visualization.c \ + volumecontrol.c \ + sync-menu.c \ + xconvert.c ifdef USE_DBUS SRCS += dbus.c endif -LIBDEP = ../libguess/libguess.a +INCLUDES = auddrct.h \ + configdb.h \ + custom_uri.h \ + dbus.h \ + discovery.h \ + dbus-service.h \ + eventqueue.h \ + flow.h \ + formatter.h \ + rcfile.h \ + i18n.h \ + input.h \ + hook.h \ + main.h \ + mime.h \ + output.h \ + playback.h \ + playlist.h \ + playlist_container.h \ + plugin.h \ + strings.h \ + tuple.h \ + tuple_formatter.h \ + tuple_compiler.h \ + ui_fileinfopopup.h \ + ui_lastfm.h \ + ui_plugin_menu.h \ + ui_preferences.h \ + util.h \ + vfs.h \ + vfs_buffer.h \ + vfs_buffered_file.h \ + xconvert.h + +DATA = glade/fileinfo.glade \ + glade/prefswin.glade \ + images/about-logo.png \ + images/appearance.png \ + images/audacious_eq.xpm \ + images/audacious_player.xpm \ + images/audacious_playlist.xpm \ + images/audio.png \ + images/connectivity.png \ + images/eq.png \ + images/info.png \ + images/menu_invert_playlist.png \ + images/menu_queue_toggle.png \ + images/menu_randomize_playlist.png \ + images/menu_remove_dups.png \ + images/menu_remove_unavail.png \ + images/menu_select_all.png \ + images/menu_select_invert.png \ + images/menu_select_none.png \ + images/menu_sort_artist.png \ + images/menu_sort_filename.png \ + images/menu_sort_pathfile.png \ + images/menu_sort_title.png \ + images/mouse.png \ + images/pl.png \ + images/play.png \ + images/playlist.png \ + images/plugins.png \ + ui/equalizer.ui \ + ui/mainwin.ui \ + ui/playlist.ui \ + ui/carbon-menubar.ui include ../../buildsys.mk -LIBADD += $(LDADD) +LDFLAGS += ${EXPORTDYN} +LIBS += ${LDADD} -ifdef USE_DBUS +ifdef USE_DBUS CPPFLAGS += -I../libaudclient DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h LIBS += -L../libaudclient -laudclient endif -LDFLAGS += ${EXPORTDYN} - -depend-hook: $(DBUS_BINDINGS) +depend-hook: ${DBUS_BINDINGS} -CPPFLAGS += -DHAVE_CONFIG_H \ - $(MOWGLI_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(BEEP_DEFINES) \ - $(ARCH_DEFINES) \ - $(DBUS_CFLAGS) \ - $(samplerate_CFLAGS) \ - $(REGEX_CFLAGS) \ - $(LIBMCS_CFLAGS) \ - -D_AUDACIOUS_CORE \ - -I.. -I../.. \ - -I./intl +CPPFLAGS += -DHAVE_CONFIG_H \ + ${MOWGLI_CFLAGS} \ + ${GTK_CFLAGS} \ + ${LIBGLADE_CFLAGS} \ + ${BEEP_DEFINES} \ + ${ARCH_DEFINES} \ + ${DBUS_CFLAGS} \ + ${samplerate_CFLAGS} \ + ${REGEX_CFLAGS} \ + ${LIBMCS_CFLAGS} \ + -D_AUDACIOUS_CORE \ + -I.. -I../.. \ + -I./intl -LIBS += \ - $(LIBINTL) \ - $(samplerate_LIBS) \ - ../libguess/libguess.a \ - $(GTK_LIBS) \ - $(DBUS_LIBS) \ - $(MOWGLI_LIBS) \ - $(LIBMCS_LIBS) \ - $(LIBGLADE_LIBS) \ - $(REGEX_LIBS) +LIBS += ${LIBINTL} \ + ${samplerate_LIBS} \ + ../libguess/libguess.a \ + ${GTK_LIBS} \ + ${DBUS_LIBS} \ + ${MOWGLI_LIBS} \ + ${LIBMCS_LIBS} \ + ${LIBGLADE_LIBS} \ + ${REGEX_LIBS} build_stamp.c: if [ -d ../../.hg ]; then \ @@ -179,23 +203,21 @@ rm -f build_stamp.c; \ fi -DBUS_BINDINGS_SOURCES = \ - objects.xml \ - mpris_root.xml \ - mpris_tracklist.xml \ - mpris_player.xml +DBUS_BINDINGS_SOURCES = objects.xml \ + mpris_root.xml \ + mpris_tracklist.xml \ + mpris_player.xml desktop_DATA = audacious.desktop -desktopdir = $(datadir)/applications +desktopdir = ${datadir}/applicationu -dbus-server-bindings.h: $(DBUS_BINDINGS_SOURCES) - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=audacious_rc objects.xml > $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@ +dbus-server-bindings.h: ${DBUS_BINDINGS_SOURCES} + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=audacious_rc objects.xml > $@ + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@ + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@ + ${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@ -dbus-client-bindings.h: $(DBUS_BINDINGS_SOURCES) - $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=audacious_rc objects.xml > $@ +dbus-client-bindings.h: ${DBUS_BINDINGS_SOURCES} + ${DBUS_BINDING_TOOL} --mode=glib-client --prefix=audacious_rc objects.xml > $@ -OBJECTIVE_DATA = audacious.desktop:$(datadir)/applications - +OBJECTIVE_DATA = audacious.desktop:${datadir}/applications
--- a/src/audacious/glade/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../../../buildsys.mk - -gladexmldir = $(pkgdatadir)/glade - -install-extra: - y="fileinfo.glade prefswin.glade"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${gladexmldir} && ${INSTALL} -m 644 $$i ${DESTDIR}${gladexmldir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="fileinfo.glade prefswin.glade"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${gladexmldir}/$$i ]; then \ - if rm -f ${DESTDIR}${gladexmldir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done; -
--- a/src/audacious/images/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../../../buildsys.mk - -imagesdir = $(pkgdatadir)/images - -install-extra: - y="*.png *.xpm"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${imagesdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${imagesdir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.png *.xpm"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${imagesdir}/$$i ]; then \ - if rm -f ${DESTDIR}${imagesdir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done; -
--- a/src/audacious/intl/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/src/audacious/intl/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,42 +1,40 @@ -SRCS = \ - bindtextdom.c \ - dcgettext.c \ - dgettext.c \ - gettext.c \ - finddomain.c \ - loadmsgcat.c \ - localealias.c \ - textdomain.c \ - l10nflist.c \ - explodename.c \ - dcigettext.c \ - dcngettext.c \ - dngettext.c \ - ngettext.c \ - plural.c \ - plural-exp.c \ - localcharset.c \ - relocatable.c \ - localename.c \ - log.c \ - osdep.c \ - os2compat.c \ - intl-compat.c - STATIC_LIB_NOINST = libintl.a +SRCS = bindtextdom.c \ + dcgettext.c \ + dgettext.c \ + gettext.c \ + finddomain.c \ + loadmsgcat.c \ + localealias.c \ + textdomain.c \ + l10nflist.c \ + explodename.c \ + dcigettext.c \ + dcngettext.c \ + dngettext.c \ + ngettext.c \ + plural.c \ + plural-exp.c \ + localcharset.c \ + relocatable.c \ + localename.c \ + log.c \ + osdep.c \ + os2compat.c \ + intl-compat.c include ../../../buildsys.mk include ../../../extra.mk -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/intl -aliaspath = $(localedir) +localedir = ${datadir)}locale +gettextsrcdir = ${datadir}/gettext/intl +aliaspath = ${localedir} -DEFS += -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ - -DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \ - -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DINSTALLPREFIX=\"$(libdir)\" -DNO_XMALLOC \ +DEFS += -DLOCALEDIR=\"${localedir}\" -DLOCALE_ALIAS_PATH=\"${aliaspath}\" \ + -DLIBDIR=\"${libdir}\" -DIN_LIBINTL \ + -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"${libdir}\" -DINSTALLPREFIX=\"${libdir}\" -DNO_XMALLOC \ -Dset_relocation_prefix=libintl_set_relocation_prefix \ -Drelocate=libintl_relocate \ -DDEPENDS_ON_LIBICONV=1 -CPPFLAGS += -I../../.. -I../.. -I. $(DEFS) +CPPFLAGS += -I../../.. -I../.. -I. ${DEFS}
--- a/src/audacious/logger.c Wed Sep 19 17:47:30 2007 +0300 +++ b/src/audacious/logger.c Thu Sep 20 23:09:16 2007 +0300 @@ -57,6 +57,7 @@ static LogHandler log_handlers[] = { {NULL, LOG_ALL_LEVELS, 0}, {"Glib", LOG_ALL_LEVELS, 0}, + {"GThread", LOG_ALL_LEVELS, 0}, {"Gtk", LOG_ALL_LEVELS, 0} };
--- a/src/audacious/ui/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../../../buildsys.mk - -gladexmldir = $(pkgdatadir)/ui - -install-extra: - y="*.ui"; \ - for i in $$y; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${gladexmldir} && ${INSTALL} -m 644 $$i ${DESTDIR}${gladexmldir}/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi; \ - done - -uninstall-extra: - y="*.ui"; \ - for i in $$y; do \ - if [ -f ${DESTDIR}${gladexmldir}/$$i ]; then \ - if rm -f ${DESTDIR}${gladexmldir}/$$i; then \ - ${DELETE_OK}; \ - else \ - ${DELETE_FAILED}; \ - fi \ - fi; \ - done; -
--- a/src/audtool/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/src/audtool/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,33 +1,24 @@ -include ../../extra.mk - PROG = audtool - -SRCS = \ - audtool_main.c \ - audtool_handlers_general.c \ - audtool_handlers_playback.c \ - audtool_handlers_playlist.c \ - audtool_handlers_playqueue.c \ - audtool_handlers_vitals.c \ - audtool_report.c +SRCS = audtool_main.c \ + audtool_handlers_general.c \ + audtool_handlers_playback.c \ + audtool_handlers_playlist.c \ + audtool_handlers_playqueue.c \ + audtool_handlers_vitals.c \ + audtool_report.c include ../../buildsys.mk - -LIBS += \ - $(DBUS_LIBS) \ - -L../libaudclient -laudclient \ - $(GTK_LIBS) \ - $(MOWGLI_LIBS) \ - $(LIBGLADE_LIBS) +include ../../extra.mk -CFLAGS += \ - $(GTK_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(BEEP_DEFINES) \ - $(ARCH_DEFINES) \ - $(MOWGLI_CFLAGS) \ - -I.. -I../.. \ - -I../intl - -CPPFLAGS += $(CFLAGS) +CPPFLAGS += ${CFLAGS} -I.. -I../.. -I../intl +CFLAGS += ${GTK_CFLAGS} \ + ${DBUS_CFLAGS} \ + ${LIBGLADE_CFLAGS} \ + ${BEEP_DEFINES} \ + ${ARCH_DEFINES} \ + ${MOWGLI_CFLAGS} +LIBS += ${DBUS_LIBS} \ + -L../libaudclient -laudclient \ + ${GTK_LIBS} \ + ${MOWGLI_LIBS} \ + ${LIBGLADE_LIBS}
--- a/src/libaudclient/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/src/libaudclient/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,5 +1,3 @@ -include ../../extra.mk - LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 @@ -9,25 +7,20 @@ INCLUDES = audctrl.h include ../../buildsys.mk +include ../../extra.mk depend-hook: cd ../audacious; make dbus-client-bindings.h -LIBS += \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(MOWGLI_LIBS) \ - $(GCONF_LIBS) \ - $(LIBMCS_LIBS) - -CFLAGS += $(LIB_CFLAGS) \ - $(MOWGLI_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBMCS_CFLAGS) \ - -D_AUDACIOUS_CORE \ - -I.. -I../.. \ - -I../intl - -CPPFLAGS = ${CFLAGS} +CPPFLAGS = ${LIB_CPPFLAGS} ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../.. -I../intl +CFLAGS += ${LIB_CFLAGS} \ + ${MOWGLI_CFLAGS} \ + ${GTK_CFLAGS} \ + ${GCONF_CFLAGS} \ + ${DBUS_CFLAGS} \ + ${LIBMCS_CFLAGS} +LIBS += ${GLIB_LIBS} \ + ${DBUS_LIBS} \ + ${MOWGLI_LIBS} \ + ${GCONF_LIBS} \ + ${LIBMCS_LIBS}
--- a/src/libguess/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/src/libguess/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,12 +1,10 @@ STATIC_LIB_NOINST = libguess.a - -SRCS = \ - guess.c \ - arabic_impl.c \ - cjk_impl.c \ - greek_impl.c \ - hebrew_impl.c \ - russian_impl.c \ - turkish_impl.c +SRCS = guess.c \ + arabic_impl.c \ + cjk_impl.c \ + greek_impl.c \ + hebrew_impl.c \ + russian_impl.c \ + turkish_impl.c include ../../buildsys.mk
--- a/src/libid3tag/Makefile Wed Sep 19 17:47:30 2007 +0300 +++ b/src/libid3tag/Makefile Thu Sep 20 23:09:16 2007 +0300 @@ -1,35 +1,32 @@ -include ../../extra.mk - LIB = ${LIB_PREFIX}audid3tag${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 -LIBDIR = $(plugindir) +LIBDIR = ${plugindir} INCLUDES = id3tag.h -SRCS = \ - compat.c \ - debug.c \ - file.c \ - frametype.c \ - latin1.c \ - render.c \ - ucs4.c \ - utf8.c \ - version.c \ - crc.c \ - field.c \ - frame.c \ - genre.c \ - parse.c \ - tag.c \ - utf16.c \ - util.c +SRCS = compat.c \ + debug.c \ + file.c \ + frametype.c \ + latin1.c \ + render.c \ + ucs4.c \ + utf8.c \ + version.c \ + crc.c \ + field.c \ + frame.c \ + genre.c \ + parse.c \ + tag.c \ + utf16.c \ + util.c include ../../buildsys.mk +include ../../extra.mk -CPPFLAGS += -I.. $(GLIB_CFLAGS) -CFLAGS += $(LIB_CFLAGS) - -LIBS += $(GLIB_LIBS) +CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS} +CFLAGS += ${LIB_CFLAGS} +LIBS += ${GLIB_LIBS}