From 1ecde309e4d8c5285037f9ba55beb44e5677b580 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 9 Dec 2014 13:15:40 +0100
Subject: [PATCH] src/win32: move resources to win32/

---
 Makefile.am                                         |  10 +++++-----
 configure.ac                                        |   2 +-
 {src/win32 => win32/res}/mpd.ico                    | Bin
 src/win32/mpd_win32_rc.rc.in => win32/res/mpd.rc.in |   2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename {src/win32 => win32/res}/mpd.ico (100%)
 rename src/win32/mpd_win32_rc.rc.in => win32/res/mpd.rc.in (94%)

diff --git a/Makefile.am b/Makefile.am
index 28fa4c520..3cded98ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -331,14 +331,14 @@ endif
 # Windows resource file
 #
 
-src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc
+win32/res/mpd.$(OBJEXT): %.$(OBJEXT): %.rc
 	$(WINDRES) -i $< -o $@
 
 if HAVE_WINDOWS
-noinst_DATA = src/win32/mpd_win32_rc.rc
+noinst_DATA = win32/res/mpd.rc
 
-EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
-src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
+EXTRA_src_mpd_DEPENDENCIES = win32/res/mpd.$(OBJEXT)
+src_mpd_LDFLAGS = -Wl,win32/res/mpd.$(OBJEXT)
 endif
 
 if ENABLE_DATABASE
@@ -2231,4 +2231,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	android/src/Bridge.java \
 	android/src/Loader.java \
 	android/src/Main.java \
-	src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico
+	win32/res/mpd.rc.in win32/res/mpd.ico
diff --git a/configure.ac b/configure.ac
index addb278ab..59e9829c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@ linux*)
 
 mingw32* | windows*)
 	AC_CONFIG_FILES([
-		src/win32/mpd_win32_rc.rc
+		win32/res/mpd.rc
 	])
 	AC_CHECK_TOOL(WINDRES, windres)
 	AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN"
diff --git a/src/win32/mpd.ico b/win32/res/mpd.ico
similarity index 100%
rename from src/win32/mpd.ico
rename to win32/res/mpd.ico
diff --git a/src/win32/mpd_win32_rc.rc.in b/win32/res/mpd.rc.in
similarity index 94%
rename from src/win32/mpd_win32_rc.rc.in
rename to win32/res/mpd.rc.in
index e5312dc78..3a33e9981 100644
--- a/src/win32/mpd_win32_rc.rc.in
+++ b/win32/res/mpd.rc.in
@@ -3,7 +3,7 @@
 #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@
 #define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@"
 
-MPD_ICON ICON "@top_srcdir@/src/win32/mpd.ico"
+MPD_ICON ICON "@top_srcdir@/win32/res/mpd.ico"
 
 1 VERSIONINFO
 FILETYPE VFT_APP