Mercurial > audlegacy
changeset 2409:30ab29ed32d8 trunk
[svn] - back out objective-make topdir probe stuff, it doesnt work on some
systems :(
- run make update-po
| author | nenolod |
|---|---|
| date | Thu, 25 Jan 2007 22:20:19 -0800 |
| parents | b380e84148bb |
| children | 79b4e8e4e2a7 |
| files | ChangeLog Makefile icons/Makefile man/Makefile mk/init.mk mk/local_policy/policy_skins.mk mk/objective.mk mk/rules.mk.in po/audacious.pot skins/Classic/Makefile skins/Default/Makefile skins/Ivory/Makefile skins/Osmosis/Makefile skins/TinyPlayer/Makefile src/Makefile src/audacious/Makefile src/audacious/glade/Makefile src/audacious/images/Makefile src/audacious/ui/Makefile src/audacious/widgets/Makefile src/audtool/Makefile src/intl/Makefile src/libaudacious++/Makefile src/libaudacious/Makefile src/libguess/Makefile src/librcd/Makefile |
| diffstat | 26 files changed, 360 insertions(+), 312 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jan 25 21:59:33 2007 -0800 +++ b/ChangeLog Thu Jan 25 22:20:19 2007 -0800 @@ -1,3 +1,11 @@ +2007-01-26 05:59:33 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [3826] + - rename some hooks so that they are more logical + + trunk/src/audacious/playlist.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + + 2007-01-26 05:29:51 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [3824] - add hooks: playback begin, playback end, playlist reached end
--- a/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -24,7 +24,7 @@ build-posthook: @( \ echo; \ - echo "Now type 'make documentation-build' to build the audacious SDK docs."; \ + echo "Now type '$(MAKE) documentation-build' to build the audacious SDK docs."; \ echo "This will require GTK-DOC to be installed."; \ echo; \ );
--- a/icons/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/icons/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,7 +1,7 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../mk/rules.mk +include ../mk/init.mk pixmapsdir = $(datadir)/pixmaps OBJECTIVE_DATA = audacious.png:$(pixmapsdir) -include ${top_srcdir}/mk/objective.mk +include ../mk/objective.mk
--- a/man/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/man/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,6 +1,6 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk -include ${top_srcdir}/mk/objective.mk +include ../mk/rules.mk +include ../mk/init.mk +include ../mk/objective.mk OBJECTIVE_DATA = \ audtool.1:$(man1dir) \
--- a/mk/init.mk Thu Jan 25 21:59:33 2007 -0800 +++ b/mk/init.mk Thu Jan 25 22:20:19 2007 -0800 @@ -1,11 +1,3 @@ -# -# Objective Make - the dumb buildsystem -# -# Copyright (c) 2005 - 2007 William Pitcock <nenolod -at- sacredspiral.co.uk> -# -# Redistribution and modification of objective make is expressly -# allowed, provided that the above copyright notice is left intact. -# # Shut up GNU make .SILENT: @@ -26,5 +18,3 @@ INCLUDEDIR = $(pkgincludedir) CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include - -OMK_FLAGS = top_srcdir="$$top_srcdir" OVERLAYS=""
--- a/mk/local_policy/policy_skins.mk Thu Jan 25 21:59:33 2007 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk - -OBJECTIVE_DATA = \ - balance.png:$(skindir) \ - cbuttons.png:$(skindir) \ - eq_ex.png:$(skindir) \ - eqmain.png:$(skindir) \ - main.png:$(skindir) \ - monoster.png:$(skindir) \ - nums_ex.png:$(skindir) \ - playpaus.png:$(skindir) \ - pledit.png:$(skindir) \ - posbar.png:$(skindir) \ - shufrep.png:$(skindir) \ - text.png:$(skindir) \ - titlebar.png:$(skindir) \ - volume.png:$(skindir) \ - pledit.txt:$(skindir) \ - viscolor.txt:$(skindir) \ - skin.hints:$(skindir) - -include ${top_srcdir}/mk/objective.mk
--- a/mk/objective.mk Thu Jan 25 21:59:33 2007 -0800 +++ b/mk/objective.mk Thu Jan 25 22:20:19 2007 -0800 @@ -1,72 +1,56 @@ -# -# Objective Make - the dumb buildsystem -# -# Copyright (c) 2005 - 2007 William Pitcock <nenolod -at- sacredspiral.co.uk> -# -# Redistribution and modification of objective make is expressly -# allowed, provided that the above copyright notice is left intact. -# - default: all all: build .SUFFIXES: .cxx .cc -MAKE += $(OMK_FLAGS) - install: build - @if [ "x$(top_srcdir)" == "x" ]; then \ - top_srcdir=`pwd`; \ - $(MAKE) install || exit; \ - exit 0; \ - fi; \ - $(MAKE) install-prehook; \ - for i in $(BINDIR) $(LIBDIR) $(INCLUDEDIR); do \ + $(MAKE) install-prehook + @for i in $(BINDIR) $(LIBDIR) $(INCLUDEDIR); do \ if [ ! -d $(DESTDIR)/$$i ]; then \ $(INSTALL) -d -m 755 $(DESTDIR)/$$i; \ fi; \ - done; \ - if [ "x$(OVERLAYS)" != "x" ]; then \ + done; + @if [ "x$(OVERLAYS)" != "x" ]; then \ for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[installing overlay: $$i]"; \ fi; \ cd $$i; OVERLAYS="" $(MAKE) install || exit; cd ..; \ done; \ - fi; \ - if [ "x$(SUBDIRS)" != "x" ]; then \ + fi + @if [ "x$(SUBDIRS)" != "x" ]; then \ for i in $(SUBDIRS); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[installing subobjective: $$i]"; \ fi; \ cd $$i; OVERLAYS="" $(MAKE) install || exit; cd ..; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_DIRECTORIES)" != "x" ]; then \ + fi + @if [ "x$(OBJECTIVE_DIRECTORIES)" != "x" ]; then \ for i in $(OBJECTIVE_DIRECTORIES); do \ printf "%10s %-20s\n" MKDIR $$i; \ $(INSTALL) -d -m 755 $(DESTDIR)/$$i; \ done; \ - fi; \ - if [ "x$(HEADERS)" != "x" ]; then \ + fi + @if [ "x$(HEADERS)" != "x" ]; then \ for i in $(HEADERS); do \ printf "%10s %-20s\n" INSTALL $$i; \ $(INSTALL_DATA) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(INCLUDEDIR)/$$i; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \ + fi + @if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \ for i in $(OBJECTIVE_LIBS); do \ printf "%10s %-20s\n" INSTALL $$i; \ $(INSTALL) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(LIBDIR)/$$i; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_BINS)" != "x" ]; then \ + fi + @if [ "x$(OBJECTIVE_BINS)" != "x" ]; then \ for i in $(OBJECTIVE_BINS); do \ printf "%10s %-20s\n" INSTALL $$i; \ $(INSTALL) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(BINDIR)/$$i; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_DATA)" != "x" ]; then \ + fi; + @if [ "x$(OBJECTIVE_DATA)" != "x" ]; then \ for i in $(OBJECTIVE_DATA); do \ source=`echo $$i | cut -d ":" -f1`; \ destination=`echo $$i | cut -d ":" -f2`; \ @@ -76,94 +60,79 @@ printf "%10s %-20s\n" INSTALL $$source; \ $(INSTALL_DATA) $(INSTALL_OVERRIDE) $$source $(DESTDIR)/$$destination; \ done; \ - fi; \ - $(MAKE) install-posthook; \ - if [ $(VERBOSITY) -gt 0 ]; then \ + fi + $(MAKE) install-posthook + @if [ $(VERBOSITY) -gt 0 ]; then \ echo "[all objectives installed]"; \ fi clean: - @if [ "x$(top_srcdir)" == "x" ]; then \ - top_srcdir=`pwd`; \ - $(MAKE) clean || exit; \ - exit 0; \ - fi; \ - $(MAKE) clean-prehook; \ - if [ "x$(OVERLAYS)" != "x" ]; then \ + $(MAKE) clean-prehook + @if [ "x$(OVERLAYS)" != "x" ]; then \ for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[cleaning overlay: $$i]"; \ fi; \ cd $$i; OVERLAYS="" $(MAKE) clean || exit; cd ..; \ done; \ - fi; \ - if [ "x$(SUBDIRS)" != "x" ]; then \ + fi + @if [ "x$(SUBDIRS)" != "x" ]; then \ for i in $(SUBDIRS); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[cleaning subobjective: $$i]"; \ fi; \ cd $$i; OVERLAYS="" $(MAKE) clean || exit; cd ..; \ done; \ - fi; \ - $(MAKE) clean-posthook; \ - rm -f *.o *.lo *.so *.a *.sl .depend-done .depend; \ - touch .depend; \ - if [ "x$(OBJECTIVE_BINS)" != "x" ]; then \ + fi + $(MAKE) clean-posthook + rm -f *.o *.lo *.so *.a *.sl .depend-done .depend + touch .depend + @if [ "x$(OBJECTIVE_BINS)" != "x" ]; then \ for i in $(OBJECTIVE_BINS); do \ rm -f $$i; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \ + fi + @if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \ for i in $(OBJECTIVE_LIBS); do \ rm -f $$i; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_LIBS_NOINST)" != "x" ]; then \ + fi + @if [ "x$(OBJECTIVE_LIBS_NOINST)" != "x" ]; then \ for i in $(OBJECTIVE_LIBS_NOINST); do \ rm -f $$i; \ done; \ - fi; \ - if [ $(VERBOSITY) -gt 0 ]; then \ + fi + @if [ $(VERBOSITY) -gt 0 ]; then \ echo "[all objectives cleaned]"; \ fi distclean: clean - @if [ "x$(top_srcdir)" == "x" ]; then \ - top_srcdir=`pwd`; \ - $(MAKE) distclean || exit; \ - exit 0; \ - fi; \ - if [ "x$(OVERLAYS)" != "x" ]; then \ + @if [ "x$(OVERLAYS)" != "x" ]; then \ for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[distcleaning overlay: $$i]"; \ fi; \ cd $$i; OVERLAYS="" $(MAKE) distclean || exit; cd ..; \ done; \ - fi; \ - if [ "x$(SUBDIRS)" != "x" ]; then \ + fi + @if [ "x$(SUBDIRS)" != "x" ]; then \ for i in $(SUBDIRS); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[distcleaning subobjective: $$i]"; \ fi; \ cd $$i; OVERLAYS="" $(MAKE) distclean || exit; cd ..; \ done; \ - fi; \ - if [ -f Makefile.in ]; then \ + fi + @if [ -f Makefile.in ]; then \ rm -f Makefile; \ - fi; \ - if [ -f mk/rules.mk ]; then \ + fi + @if [ -f mk/rules.mk ]; then \ rm -f mk/rules.mk; \ fi build: depend - @if [ "x$(top_srcdir)" == "x" ]; then \ - top_srcdir=`pwd`; \ - $(MAKE) build || exit; \ - exit 0; \ - fi; \ - $(MAKE) build-prehook; \ - if [ "x$(OVERLAYS)" != "x" ]; then \ + $(MAKE) build-prehook + @if [ "x$(OVERLAYS)" != "x" ]; then \ for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[building overlay: $$i]"; \ @@ -173,8 +142,8 @@ echo "[finished overlay: $$i]"; \ fi; \ done; \ - fi; \ - if [ "x$(SUBDIRS)" != "x" ]; then \ + fi + @if [ "x$(SUBDIRS)" != "x" ]; then \ for i in $(SUBDIRS); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[building subobjective: $$i]"; \ @@ -184,8 +153,8 @@ echo "[finished subobjective: $$i]"; \ fi; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \ + fi + @if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \ for i in $(OBJECTIVE_LIBS); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[building library objective: $$i]"; \ @@ -195,8 +164,8 @@ echo "[finished library objective: $$i]"; \ fi; \ done; \ - fi; \ - if [ "x$(OBJECTIVE_LIBS_NOINST)" != "x" ]; then \ + fi + @if [ "x$(OBJECTIVE_LIBS_NOINST)" != "x" ]; then \ for i in $(OBJECTIVE_LIBS_NOINST); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[building library dependency: $$i]"; \ @@ -206,8 +175,8 @@ echo "[finished library dependency: $$i]"; \ fi; \ done; \ - fi; \ - if test "x$(OBJECTIVE_BINS)" != "x"; then \ + fi + @if test "x$(OBJECTIVE_BINS)" != "x"; then \ for i in $(OBJECTIVE_BINS); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[building binary objective: $$i]"; \ @@ -217,9 +186,9 @@ echo "[finished binary objective: $$i]"; \ fi; \ done; \ - fi; \ - $(MAKE) build-posthook; \ - if [ $(VERBOSITY) -gt 0 ]; then \ + fi + $(MAKE) build-posthook + @if [ $(VERBOSITY) -gt 0 ]; then \ echo "[all objectives built]"; \ fi @@ -287,12 +256,7 @@ # default depend rule. if something else is needed -- override depend target depend: - @if [ "x$(top_srcdir)" == "x" ]; then \ - top_srcdir=`pwd`; \ - $(MAKE) depend || exit; \ - exit 0; \ - fi; \ - if [ "x$(SUBDIRS)" != "x" ]; then \ + @if [ "x$(SUBDIRS)" != "x" ]; then \ for i in $(SUBDIRS); do \ if [ $(VERBOSITY) -gt 0 ]; then \ echo "[building depend file for subobjective: $$i]"; \ @@ -302,7 +266,7 @@ echo "[finished subobjective: $$i]"; \ fi; \ done; \ - fi; \ + fi if [ ! -f .depend-done ]; then \ for i in ${SOURCES}; do \ echo "[generating dependencies for objective: $$i]"; \
--- a/mk/rules.mk.in Thu Jan 25 21:59:33 2007 -0800 +++ b/mk/rules.mk.in Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,7 @@ @SET_MAKE@ +srcdir ?= @srcdir@ +top_srcdir ?= @top_srcdir@ VPATH ?= @srcdir@ pkgdatadir ?= $(datadir)/@PACKAGE@ pkglibdir ?= $(libdir)/@PACKAGE@
--- a/po/audacious.pot Thu Jan 25 21:59:33 2007 -0800 +++ b/po/audacious.pot Thu Jan 25 22:20:19 2007 -0800 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" -"POT-Creation-Date: 2007-01-19 22:53-0600\n" +"POT-Creation-Date: 2007-01-25 11:01-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -24,12 +24,12 @@ "Copyright (C) 2005-2007 Audacious Development Team" msgstr "" -#: src/audacious/ui_about.c:123 src/audacious/ui_credits.c:327 +#: src/audacious/ui_about.c:123 src/audacious/ui_credits.c:329 #: src/audacious/ui_manager.c:387 src/audacious/ui_manager.c:388 msgid "About Audacious" msgstr "" -#: src/audacious/ui_about.c:172 src/audacious/ui_credits.c:372 +#: src/audacious/ui_about.c:172 src/audacious/ui_credits.c:374 msgid "Credits" msgstr "" @@ -46,147 +46,147 @@ msgid "Audacious core developers:" msgstr "" -#: src/audacious/ui_credits.c:65 +#: src/audacious/ui_credits.c:66 msgid "Graphics:" msgstr "" -#: src/audacious/ui_credits.c:70 +#: src/audacious/ui_credits.c:71 msgid "Default skin:" msgstr "" -#: src/audacious/ui_credits.c:75 +#: src/audacious/ui_credits.c:76 msgid "Plugin development:" msgstr "" -#: src/audacious/ui_credits.c:86 +#: src/audacious/ui_credits.c:88 msgid "Patch authors:" msgstr "" -#: src/audacious/ui_credits.c:101 +#: src/audacious/ui_credits.c:103 msgid "0.1.x developers:" msgstr "" -#: src/audacious/ui_credits.c:107 +#: src/audacious/ui_credits.c:109 msgid "BMP Developers:" msgstr "" -#: src/audacious/ui_credits.c:139 +#: src/audacious/ui_credits.c:141 msgid "Brazilian Portuguese:" msgstr "" -#: src/audacious/ui_credits.c:142 +#: src/audacious/ui_credits.c:144 msgid "Breton:" msgstr "" -#: src/audacious/ui_credits.c:145 +#: src/audacious/ui_credits.c:147 msgid "Bulgarian:" msgstr "" -#: src/audacious/ui_credits.c:148 +#: src/audacious/ui_credits.c:150 msgid "Czech:" msgstr "" -#: src/audacious/ui_credits.c:151 +#: src/audacious/ui_credits.c:153 msgid "Dutch:" msgstr "" -#: src/audacious/ui_credits.c:155 +#: src/audacious/ui_credits.c:157 msgid "Finnish:" msgstr "" -#: src/audacious/ui_credits.c:158 +#: src/audacious/ui_credits.c:160 msgid "French:" msgstr "" -#: src/audacious/ui_credits.c:161 +#: src/audacious/ui_credits.c:163 msgid "German:" msgstr "" -#: src/audacious/ui_credits.c:165 +#: src/audacious/ui_credits.c:167 msgid "Georgian:" msgstr "" -#: src/audacious/ui_credits.c:168 +#: src/audacious/ui_credits.c:170 msgid "Greek:" msgstr "" -#: src/audacious/ui_credits.c:173 +#: src/audacious/ui_credits.c:175 msgid "Hindi:" msgstr "" -#: src/audacious/ui_credits.c:176 +#: src/audacious/ui_credits.c:178 msgid "Hungarian:" msgstr "" -#: src/audacious/ui_credits.c:179 +#: src/audacious/ui_credits.c:181 msgid "Italian:" msgstr "" -#: src/audacious/ui_credits.c:183 +#: src/audacious/ui_credits.c:185 msgid "Japanese:" msgstr "" -#: src/audacious/ui_credits.c:186 +#: src/audacious/ui_credits.c:188 msgid "Korean:" msgstr "" -#: src/audacious/ui_credits.c:189 +#: src/audacious/ui_credits.c:191 msgid "Lithuanian:" msgstr "" -#: src/audacious/ui_credits.c:192 +#: src/audacious/ui_credits.c:194 msgid "Macedonian:" msgstr "" -#: src/audacious/ui_credits.c:195 +#: src/audacious/ui_credits.c:197 msgid "Polish:" msgstr "" -#: src/audacious/ui_credits.c:198 +#: src/audacious/ui_credits.c:200 msgid "Romanian:" msgstr "" -#: src/audacious/ui_credits.c:201 +#: src/audacious/ui_credits.c:203 msgid "Russian:" msgstr "" -#: src/audacious/ui_credits.c:204 +#: src/audacious/ui_credits.c:206 msgid "Serbian (Latin):" msgstr "" -#: src/audacious/ui_credits.c:207 +#: src/audacious/ui_credits.c:209 msgid "Serbian (Cyrillic):" msgstr "" -#: src/audacious/ui_credits.c:210 +#: src/audacious/ui_credits.c:212 msgid "Simplified Chinese:" msgstr "" -#: src/audacious/ui_credits.c:213 +#: src/audacious/ui_credits.c:215 msgid "Slovak:" msgstr "" -#: src/audacious/ui_credits.c:216 +#: src/audacious/ui_credits.c:218 msgid "Spanish:" msgstr "" -#: src/audacious/ui_credits.c:219 +#: src/audacious/ui_credits.c:221 msgid "Swedish:" msgstr "" -#: src/audacious/ui_credits.c:222 +#: src/audacious/ui_credits.c:224 msgid "Traditional Chinese:" msgstr "" -#: src/audacious/ui_credits.c:225 +#: src/audacious/ui_credits.c:227 msgid "Ukrainian:" msgstr "" -#: src/audacious/ui_credits.c:228 +#: src/audacious/ui_credits.c:230 msgid "Welsh:" msgstr "" -#: src/audacious/ui_credits.c:376 +#: src/audacious/ui_credits.c:378 msgid "Translators" msgstr "" @@ -278,9 +278,9 @@ msgid "Show more _details" msgstr "" -#: src/audacious/input.c:348 src/audacious/ui_preferences.c:117 -#: src/audacious/ui_preferences.c:485 src/audacious/ui_preferences.c:573 -#: src/audacious/ui_preferences.c:662 src/audacious/ui_preferences.c:758 +#: src/audacious/input.c:348 src/audacious/ui_preferences.c:118 +#: src/audacious/ui_preferences.c:486 src/audacious/ui_preferences.c:574 +#: src/audacious/ui_preferences.c:663 src/audacious/ui_preferences.c:759 msgid "Filename" msgstr "" @@ -307,8 +307,8 @@ msgid "Unable to create log file (%s)!\n" msgstr "" -#: src/audacious/main.c:84 src/audacious/main.c:86 src/audacious/ui_main.c:626 -#: src/audacious/ui_main.c:3401 +#: src/audacious/main.c:84 src/audacious/main.c:86 src/audacious/ui_main.c:627 +#: src/audacious/ui_main.c:3402 msgid "Audacious" msgstr "" @@ -398,14 +398,14 @@ "'%s'\n" msgstr "" -#: src/audacious/main.c:1130 +#: src/audacious/main.c:1140 #, c-format msgid "" "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n" "Please use GTK+ %s or newer.\n" msgstr "" -#: src/audacious/main.c:1141 +#: src/audacious/main.c:1151 msgid "" "Sorry, threads isn't supported on your platform.\n" "\n" @@ -414,7 +414,7 @@ "installed LinuxThreads you need to recompile Glib & GTK+.\n" msgstr "" -#: src/audacious/main.c:1160 +#: src/audacious/main.c:1170 msgid "audacious: Unable to open display, exiting.\n" msgstr "" @@ -428,124 +428,124 @@ "\n" msgstr "" -#: src/audacious/strings.c:196 +#: src/audacious/strings.c:172 msgid " (invalid UTF-8)" msgstr "" -#: src/audacious/ui_main.c:624 +#: src/audacious/ui_main.c:625 #, c-format msgid "%s - Audacious" msgstr "" -#: src/audacious/ui_main.c:849 +#: src/audacious/ui_main.c:850 msgid "VBR" msgstr "" -#: src/audacious/ui_main.c:890 src/audacious/ui_main.c:894 +#: src/audacious/ui_main.c:891 src/audacious/ui_main.c:895 msgid "stereo" msgstr "" -#: src/audacious/ui_main.c:890 src/audacious/ui_main.c:894 +#: src/audacious/ui_main.c:891 src/audacious/ui_main.c:895 msgid "mono" msgstr "" -#: src/audacious/ui_main.c:1383 src/audacious/ui_manager.c:414 +#: src/audacious/ui_main.c:1384 src/audacious/ui_manager.c:414 #: src/audacious/ui_manager.c:415 msgid "Jump to Time" msgstr "" -#: src/audacious/ui_main.c:1404 +#: src/audacious/ui_main.c:1405 msgid "minutes:seconds" msgstr "" -#: src/audacious/ui_main.c:1414 +#: src/audacious/ui_main.c:1415 msgid "Track length:" msgstr "" -#: src/audacious/ui_main.c:1499 +#: src/audacious/ui_main.c:1500 msgid "Un_queue" msgstr "" -#: src/audacious/ui_main.c:1501 src/audacious/ui_main.c:1889 +#: src/audacious/ui_main.c:1502 src/audacious/ui_main.c:1890 msgid "_Queue" msgstr "" -#: src/audacious/ui_main.c:1814 +#: src/audacious/ui_main.c:1815 msgid "Jump to Track" msgstr "" -#: src/audacious/ui_main.c:1855 -msgid "Filter: " -msgstr "" - #: src/audacious/ui_main.c:1856 +msgid "Filter: " +msgstr "" + +#: src/audacious/ui_main.c:1857 msgid "_Filter:" msgstr "" -#: src/audacious/ui_main.c:2060 +#: src/audacious/ui_main.c:2061 msgid "Enter location to play:" msgstr "" -#: src/audacious/ui_main.c:2271 +#: src/audacious/ui_main.c:2272 #, c-format msgid "SEEK TO: %d:%-2.2d/%d:%-2.2d (%d%%)" msgstr "" -#: src/audacious/ui_main.c:2303 src/audacious/ui_main.c:2922 +#: src/audacious/ui_main.c:2304 src/audacious/ui_main.c:2923 #, c-format msgid "VOLUME: %d%%" msgstr "" -#: src/audacious/ui_main.c:2334 src/audacious/ui_main.c:2925 +#: src/audacious/ui_main.c:2335 src/audacious/ui_main.c:2926 #, c-format msgid "BALANCE: %d%% LEFT" msgstr "" -#: src/audacious/ui_main.c:2338 src/audacious/ui_main.c:2928 +#: src/audacious/ui_main.c:2339 src/audacious/ui_main.c:2929 msgid "BALANCE: CENTER" msgstr "" -#: src/audacious/ui_main.c:2342 src/audacious/ui_main.c:2930 +#: src/audacious/ui_main.c:2343 src/audacious/ui_main.c:2931 #, c-format msgid "BALANCE: %d%% RIGHT" msgstr "" -#: src/audacious/ui_main.c:2698 +#: src/audacious/ui_main.c:2699 msgid "OPTIONS MENU" msgstr "" -#: src/audacious/ui_main.c:2702 +#: src/audacious/ui_main.c:2703 msgid "DISABLE ALWAYS ON TOP" msgstr "" -#: src/audacious/ui_main.c:2704 +#: src/audacious/ui_main.c:2705 msgid "ENABLE ALWAYS ON TOP" msgstr "" -#: src/audacious/ui_main.c:2707 +#: src/audacious/ui_main.c:2708 msgid "FILE INFO BOX" msgstr "" -#: src/audacious/ui_main.c:2711 +#: src/audacious/ui_main.c:2712 msgid "DISABLE DOUBLESIZE" msgstr "" -#: src/audacious/ui_main.c:2713 +#: src/audacious/ui_main.c:2714 msgid "ENABLE DOUBLESIZE" msgstr "" -#: src/audacious/ui_main.c:2716 +#: src/audacious/ui_main.c:2717 msgid "VISUALIZATION MENU" msgstr "" -#: src/audacious/ui_main.c:2762 +#: src/audacious/ui_main.c:2763 msgid "" "<b><big>No playable CD found.</big></b>\n" "\n" "No CD inserted, or inserted CD is not an audio CD.\n" msgstr "" -#: src/audacious/ui_main.c:2779 +#: src/audacious/ui_main.c:2780 msgid "" "<b><big>Couldn't open audio.</big></b>\n" "\n" @@ -555,7 +555,7 @@ "3. Your soundcard is configured properly.\n" msgstr "" -#: src/audacious/ui_main.c:3385 +#: src/audacious/ui_main.c:3386 msgid "Error in Audacious." msgstr "" @@ -788,7 +788,7 @@ msgid "Peaks Falloff" msgstr "" -#: src/audacious/ui_manager.c:201 src/audacious/ui_preferences.c:105 +#: src/audacious/ui_manager.c:201 src/audacious/ui_preferences.c:106 #: src/audacious/playlist_manager.c:288 #: src/audacious/glade/prefswin.glade:2530 msgid "Playlist" @@ -1225,85 +1225,85 @@ msgid "Delete auto-load preset" msgstr "" -#: src/audacious/ui_preferences.c:100 src/audacious/glade/prefswin.glade:1399 +#: src/audacious/ui_preferences.c:101 src/audacious/glade/prefswin.glade:1399 msgid "Appearance" msgstr "" -#: src/audacious/ui_preferences.c:101 +#: src/audacious/ui_preferences.c:102 msgid "Audio" msgstr "" -#: src/audacious/ui_preferences.c:102 +#: src/audacious/ui_preferences.c:103 msgid "Connectivity" msgstr "" -#: src/audacious/ui_preferences.c:103 src/audacious/glade/prefswin.glade:2898 +#: src/audacious/ui_preferences.c:104 src/audacious/glade/prefswin.glade:2898 msgid "Equalizer" msgstr "" -#: src/audacious/ui_preferences.c:104 src/audacious/glade/prefswin.glade:1678 +#: src/audacious/ui_preferences.c:105 src/audacious/glade/prefswin.glade:1678 msgid "Mouse" msgstr "" -#: src/audacious/ui_preferences.c:106 src/audacious/glade/prefswin.glade:693 +#: src/audacious/ui_preferences.c:107 src/audacious/glade/prefswin.glade:693 msgid "Plugins" msgstr "" -#: src/audacious/ui_preferences.c:112 +#: src/audacious/ui_preferences.c:113 msgid "Artist" msgstr "" -#: src/audacious/ui_preferences.c:113 src/libaudacious/titlestring.c:372 +#: src/audacious/ui_preferences.c:114 src/libaudacious/titlestring.c:372 msgid "Album" msgstr "" -#: src/audacious/ui_preferences.c:114 +#: src/audacious/ui_preferences.c:115 msgid "Title" msgstr "" -#: src/audacious/ui_preferences.c:115 +#: src/audacious/ui_preferences.c:116 msgid "Tracknumber" msgstr "" -#: src/audacious/ui_preferences.c:116 src/libaudacious/titlestring.c:373 +#: src/audacious/ui_preferences.c:117 src/libaudacious/titlestring.c:373 msgid "Genre" msgstr "" -#: src/audacious/ui_preferences.c:118 +#: src/audacious/ui_preferences.c:119 msgid "Filepath" msgstr "" -#: src/audacious/ui_preferences.c:119 src/libaudacious/titlestring.c:379 +#: src/audacious/ui_preferences.c:120 src/libaudacious/titlestring.c:379 msgid "Date" msgstr "" -#: src/audacious/ui_preferences.c:120 src/libaudacious/titlestring.c:380 +#: src/audacious/ui_preferences.c:121 src/libaudacious/titlestring.c:380 msgid "Year" msgstr "" -#: src/audacious/ui_preferences.c:121 src/libaudacious/titlestring.c:381 +#: src/audacious/ui_preferences.c:122 src/libaudacious/titlestring.c:381 msgid "Comment" msgstr "" -#: src/audacious/ui_preferences.c:142 +#: src/audacious/ui_preferences.c:143 msgid "localhost" msgstr "" -#: src/audacious/ui_preferences.c:455 src/audacious/ui_preferences.c:542 -#: src/audacious/ui_preferences.c:631 src/audacious/ui_preferences.c:727 +#: src/audacious/ui_preferences.c:456 src/audacious/ui_preferences.c:543 +#: src/audacious/ui_preferences.c:632 src/audacious/ui_preferences.c:728 msgid "Enabled" msgstr "" -#: src/audacious/ui_preferences.c:471 src/audacious/ui_preferences.c:558 -#: src/audacious/ui_preferences.c:647 src/audacious/ui_preferences.c:743 +#: src/audacious/ui_preferences.c:472 src/audacious/ui_preferences.c:559 +#: src/audacious/ui_preferences.c:648 src/audacious/ui_preferences.c:744 msgid "Description" msgstr "" -#: src/audacious/ui_preferences.c:1798 +#: src/audacious/ui_preferences.c:1799 msgid "Category" msgstr "" -#: src/audacious/ui_preferences.c:2353 +#: src/audacious/ui_preferences.c:2354 msgid "Preferences Window" msgstr "" @@ -1315,15 +1315,15 @@ msgid "Unarchived Winamp 2.x skin" msgstr "" -#: src/audacious/ui_fileinfo.c:159 +#: src/audacious/ui_fileinfo.c:160 msgid "Track Information Window" msgstr "" -#: src/audacious/ui_playlist.c:500 +#: src/audacious/ui_playlist.c:487 msgid "Search entries in active playlist" msgstr "" -#: src/audacious/ui_playlist.c:506 +#: src/audacious/ui_playlist.c:493 msgid "" "Select entries in playlist by filling one or more fields. Fields use regular " "expressions syntax, case-insensitive. If you don't know how regular " @@ -1331,45 +1331,45 @@ "for." msgstr "" -#: src/audacious/ui_playlist.c:513 +#: src/audacious/ui_playlist.c:500 msgid "Track name: " msgstr "" -#: src/audacious/ui_playlist.c:519 +#: src/audacious/ui_playlist.c:506 msgid "Album name: " msgstr "" +#: src/audacious/ui_playlist.c:512 +msgid "Artist: " +msgstr "" + +#: src/audacious/ui_playlist.c:518 +msgid "Filename: " +msgstr "" + #: src/audacious/ui_playlist.c:525 -msgid "Artist: " +msgid "Clear previous selection before searching" +msgstr "" + +#: src/audacious/ui_playlist.c:528 +msgid "Automatically toggle queue for matching entries" msgstr "" #: src/audacious/ui_playlist.c:531 -msgid "Filename: " -msgstr "" - -#: src/audacious/ui_playlist.c:538 -msgid "Clear previous selection before searching" -msgstr "" - -#: src/audacious/ui_playlist.c:541 -msgid "Automatically toggle queue for matching entries" -msgstr "" - -#: src/audacious/ui_playlist.c:544 msgid "Create a new playlist with matching entries" msgstr "" -#: src/audacious/ui_playlist.c:773 +#: src/audacious/ui_playlist.c:750 #, c-format msgid "Error writing playlist \"%s\": %s" msgstr "" -#: src/audacious/ui_playlist.c:794 +#: src/audacious/ui_playlist.c:771 #, c-format msgid "%s already exist. Continue?" msgstr "" -#: src/audacious/ui_playlist.c:808 +#: src/audacious/ui_playlist.c:785 #, c-format msgid "" "<b><big>Unable to save playlist.</big></b>\n" @@ -1377,51 +1377,51 @@ "Unknown file type for '%s'.\n" msgstr "" -#: src/audacious/ui_playlist.c:961 +#: src/audacious/ui_playlist.c:925 msgid "Load Playlist" msgstr "" -#: src/audacious/ui_playlist.c:974 +#: src/audacious/ui_playlist.c:938 msgid "Save Playlist" msgstr "" -#: src/audacious/ui_playlist.c:1694 +#: src/audacious/ui_playlist.c:1658 msgid "Audacious Playlist Editor" msgstr "" -#: src/audacious/util.c:610 +#: src/audacious/util.c:602 msgid "Add/Open URL Dialog" msgstr "" -#: src/audacious/util.c:862 +#: src/audacious/util.c:854 msgid "Add/Open Files dialog" msgstr "" -#: src/audacious/util.c:917 +#: src/audacious/util.c:909 msgid "Open Files" msgstr "" -#: src/audacious/util.c:921 +#: src/audacious/util.c:913 msgid "Close dialog on Open" msgstr "" -#: src/audacious/util.c:931 src/audacious/glade/addfiles.glade:8 +#: src/audacious/util.c:923 src/audacious/glade/addfiles.glade:8 msgid "Add Files" msgstr "" -#: src/audacious/util.c:935 +#: src/audacious/util.c:927 msgid "Close dialog on Add" msgstr "" -#: src/audacious/util.c:1113 +#: src/audacious/util.c:1105 msgid "Play files" msgstr "" -#: src/audacious/util.c:1115 +#: src/audacious/util.c:1107 msgid "Load files" msgstr "" -#: src/audacious/playback.c:227 +#: src/audacious/playback.c:203 msgid "" "<b><big>No output plugin selected.</big></b>\n" "You have not selected an output plugin."
--- a/skins/Classic/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/skins/Classic/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,3 +1,25 @@ -include ${top_srcdir}/mk/local_policy/policy_skins.mk +include ${top_srcdir}/mk/rules.mk +include ${top_srcdir}/mk/init.mk skindir = $(pkgdatadir)/Skins/Classic + +OBJECTIVE_DATA = \ + balance.png:$(skindir) \ + cbuttons.png:$(skindir) \ + eq_ex.png:$(skindir) \ + eqmain.png:$(skindir) \ + main.png:$(skindir) \ + monoster.png:$(skindir) \ + nums_ex.png:$(skindir) \ + playpaus.png:$(skindir) \ + pledit.png:$(skindir) \ + posbar.png:$(skindir) \ + shufrep.png:$(skindir) \ + text.png:$(skindir) \ + titlebar.png:$(skindir) \ + volume.png:$(skindir) \ + pledit.txt:$(skindir) \ + viscolor.txt:$(skindir) \ + skin.hints:$(skindir) + +include ${top_srcdir}/mk/objective.mk
--- a/skins/Default/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/skins/Default/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,3 +1,25 @@ -include ${top_srcdir}/mk/local_policy/policy_skins.mk +include ${top_srcdir}/mk/rules.mk +include ${top_srcdir}/mk/init.mk skindir = $(pkgdatadir)/Skins/Default + +OBJECTIVE_DATA = \ + balance.png:$(skindir) \ + cbuttons.png:$(skindir) \ + eq_ex.png:$(skindir) \ + eqmain.png:$(skindir) \ + main.png:$(skindir) \ + monoster.png:$(skindir) \ + nums_ex.png:$(skindir) \ + playpaus.png:$(skindir) \ + pledit.png:$(skindir) \ + posbar.png:$(skindir) \ + shufrep.png:$(skindir) \ + text.png:$(skindir) \ + titlebar.png:$(skindir) \ + volume.png:$(skindir) \ + pledit.txt:$(skindir) \ + viscolor.txt:$(skindir) \ + skin.hints:$(skindir) + +include ${top_srcdir}/mk/objective.mk
--- a/skins/Ivory/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/skins/Ivory/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,3 +1,24 @@ -include ${top_srcdir}/mk/local_policy/policy_skins.mk +include ${top_srcdir}/mk/rules.mk +include ${top_srcdir}/mk/init.mk skindir = $(pkgdatadir)/Skins/Ivory +OBJECTIVE_DATA = \ + balance.png:$(skindir) \ + cbuttons.png:$(skindir) \ + eq_ex.png:$(skindir) \ + eqmain.png:$(skindir) \ + main.png:$(skindir) \ + monoster.png:$(skindir) \ + nums_ex.png:$(skindir) \ + playpaus.png:$(skindir) \ + pledit.png:$(skindir) \ + posbar.png:$(skindir) \ + shufrep.png:$(skindir) \ + text.png:$(skindir) \ + titlebar.png:$(skindir) \ + volume.png:$(skindir) \ + pledit.txt:$(skindir) \ + viscolor.txt:$(skindir) \ + skin.hints:$(skindir) + +include ${top_srcdir}/mk/objective.mk
--- a/skins/Osmosis/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/skins/Osmosis/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,3 +1,24 @@ -include ${top_srcdir}/mk/local_policy/policy_skins.mk +include ${top_srcdir}/mk/rules.mk +include ${top_srcdir}/mk/init.mk skindir = $(pkgdatadir)/Skins/Osmosis +OBJECTIVE_DATA = \ + balance.png:$(skindir) \ + cbuttons.png:$(skindir) \ + eq_ex.png:$(skindir) \ + eqmain.png:$(skindir) \ + main.png:$(skindir) \ + monoster.png:$(skindir) \ + nums_ex.png:$(skindir) \ + playpaus.png:$(skindir) \ + pledit.png:$(skindir) \ + posbar.png:$(skindir) \ + shufrep.png:$(skindir) \ + text.png:$(skindir) \ + titlebar.png:$(skindir) \ + volume.png:$(skindir) \ + pledit.txt:$(skindir) \ + viscolor.txt:$(skindir) \ + skin.hints:$(skindir) + +include ${top_srcdir}/mk/objective.mk
--- a/skins/TinyPlayer/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/skins/TinyPlayer/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,3 +1,24 @@ -include ${top_srcdir}/mk/local_policy/policy_skins.mk +include ${top_srcdir}/mk/rules.mk +include ${top_srcdir}/mk/init.mk skindir = $(pkgdatadir)/Skins/TinyPlayer +OBJECTIVE_DATA = \ + balance.png:$(skindir) \ + cbuttons.png:$(skindir) \ + eq_ex.png:$(skindir) \ + eqmain.png:$(skindir) \ + main.png:$(skindir) \ + monoster.png:$(skindir) \ + nums_ex.png:$(skindir) \ + playpaus.png:$(skindir) \ + pledit.png:$(skindir) \ + posbar.png:$(skindir) \ + shufrep.png:$(skindir) \ + text.png:$(skindir) \ + titlebar.png:$(skindir) \ + volume.png:$(skindir) \ + pledit.txt:$(skindir) \ + viscolor.txt:$(skindir) \ + skin.hints:$(skindir) + +include ${top_srcdir}/mk/objective.mk
--- a/src/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,9 +1,9 @@ .SILENT: -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../mk/rules.mk +include ../mk/init.mk SUBDIRS = libaudacious $(INTL_OBJECTIVE) $(SUBDIR_GUESS) audacious audtool -include ${top_srcdir}/mk/objective.mk +include ../mk/objective.mk
--- a/src/audacious/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/audacious/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,6 +1,6 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk -include ${top_srcdir}/mk/objective.mk +include ../../mk/rules.mk +include ../../mk/init.mk +include ../../mk/objective.mk SUBDIRS = widgets glade images ui @@ -24,7 +24,7 @@ $(ARCH_DEFINES) \ $(REGEX_CFLAGS) \ -D_AUDACIOUS_CORE \ - -I.. -I${top_srcdir} \ + -I.. -I../.. \ -I../intl HEADERS = \
--- a/src/audacious/glade/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/audacious/glade/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk gladexmldir = $(pkgdatadir)/glade @@ -7,4 +7,4 @@ fileinfo.glade:$(gladexmldir) \ prefswin.glade:$(gladexmldir) -include ${top_srcdir}/mk/objective.mk +include ../../../mk/objective.mk
--- a/src/audacious/images/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/audacious/images/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk imagesdir = $(pkgdatadir)/images @@ -14,4 +14,4 @@ plugins.png:$(imagesdir) \ eq.png:$(imagesdir) -include ${top_srcdir}/mk/objective.mk +include ../../../mk/objective.mk
--- a/src/audacious/ui/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/audacious/ui/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk gladexmldir = $(pkgdatadir)/ui @@ -8,4 +8,4 @@ playlist.ui:$(gladexmldir) \ equalizer.ui:$(gladexmldir) -include ${top_srcdir}/mk/objective.mk +include ../../../mk/objective.mk
--- a/src/audacious/widgets/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/audacious/widgets/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk OBJECTIVE_LIBS_NOINST = libwidgets.a @@ -11,7 +11,7 @@ $(BEEP_DEFINES) \ $(ARCH_DEFINES) \ -D_AUDACIOUS_CORE \ - -I${top_srcdir} \ + -I../../.. \ -I../.. \ -I.. \ -I../../intl \ @@ -38,7 +38,7 @@ OBJECTS = ${SOURCES:.c=.o} -include ${top_srcdir}/mk/objective.mk +include ../../../mk/objective.mk libwidgets.a: $(OBJECTS) $(AR) cr $@ $(OBJECTS)
--- a/src/audtool/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/audtool/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,6 +1,6 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk -include ${top_srcdir}/mk/objective.mk +include ../../mk/rules.mk +include ../../mk/init.mk +include ../../mk/objective.mk OBJECTIVE_BINS = audtool @@ -15,7 +15,7 @@ $(LIBGLADE_CFLAGS) \ $(BEEP_DEFINES) \ $(ARCH_DEFINES) \ - -I.. -I${top_srcdir} \ + -I.. -I../.. \ -I../intl SOURCES = audtool.c
--- a/src/intl/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/intl/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../mk/rules.mk +include ../../mk/init.mk localedir = $(datadir)/locale gettextsrcdir = $(datadir)/gettext/intl @@ -43,7 +43,7 @@ OBJECTS = ${SOURCES:.c=.o} -include ${top_srcdir}/mk/objective.mk +include ../../mk/objective.mk libintl.a: $(OBJECTS) $(AR) cq $@ $(OBJECTS)
--- a/src/libaudacious++/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/libaudacious++/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../mk/rules.mk +include ../../mk/init.mk PICLDFLAGS = $(LIBLDFLAGS) @@ -16,7 +16,7 @@ $(GTK_CFLAGS) \ $(GCONF_CFLAGS) \ -D_AUDACIOUS_CORE \ - -I.. -I${top_srcdir} \ + -I.. -I../.. \ -I../intl SOURCES = configdb.cxx @@ -25,7 +25,7 @@ HEADERS = configdb.hh -include ${top_srcdir}/mk/objective.mk +include ../../mk/objective.mk install-posthook: @mv ${DESTDIR}/${LIBDIR}/libaudacious++$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious++$(SHARED_SUFFIX).1.0.0
--- a/src/libaudacious/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/libaudacious/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../mk/rules.mk +include ../../mk/init.mk PICLDFLAGS = $(LIBLDFLAGS) @@ -16,7 +16,7 @@ $(GCONF_CFLAGS) \ $(LIBMCS_CFLAGS) \ -D_AUDACIOUS_CORE \ - -I.. -I${top_srcdir} \ + -I.. -I../.. \ -I../intl CONF_SRC = configdb_$(CONFIGDB_BACKEND).c @@ -38,7 +38,7 @@ beepctrl.h urldecode.h \ formatter.h titlestring.h xconvert.h -include ${top_srcdir}/mk/objective.mk +include ../../mk/objective.mk install-posthook: @mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0
--- a/src/libguess/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/libguess/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../mk/rules.mk +include ../../mk/init.mk OBJECTIVE_LIBS_NOINST = libguess.a OBJECTIVE_SONAME_SUFFIX = 0.2.0 @@ -13,7 +13,7 @@ OBJECTS = ${SOURCES:.c=.o} -include ${top_srcdir}/mk/objective.mk +include ../../mk/objective.mk libguess.a: $(OBJECTS) $(AR) cq $@ $(OBJECTS)
--- a/src/librcd/Makefile Thu Jan 25 21:59:33 2007 -0800 +++ b/src/librcd/Makefile Thu Jan 25 22:20:19 2007 -0800 @@ -1,5 +1,5 @@ -include ${top_srcdir}/mk/rules.mk -include ${top_srcdir}/mk/init.mk +include ../../mk/rules.mk +include ../../mk/init.mk OBJECTIVE_LIBS_NOINST = librcd.a OBJECTIVE_SONAME_SUFFIX = 0.1.8 @@ -13,7 +13,7 @@ OBJECTS = ${SOURCES:.c=.o} -include ${top_srcdir}/mk/objective.mk +include ../../mk/objective.mk libguess.a: $(OBJECTS) $(AR) cq $@ $(OBJECTS)