win32: rename resource files

Since more than just icon resources are now provided give various
files more appropriate names.

10 files changed, 8 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index 2a7f2f79b..eeb5c2182 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ Config.in
 /busybox.exe
 /busybox_old
 /busybox_unstripped*
+win32/resources/busybox-w32.manifest
 
 #
 # Backups / patches
diff --git a/Makefile b/Makefile
index dfab2e914..ee30c1f08 100644
--- a/Makefile
+++ b/Makefile
@@ -464,7 +464,7 @@ scripts_basic: include/autoconf.h
 # Objects we will link into busybox / subdirs we need to visit
 core-y          := \
                 applets/ \
-                win32/icon/ \
+                win32/resources/ \
 
 libs-y          := \
                 archival/ \
diff --git a/win32/icon/COPYING_CCBYSA3 b/win32/resources/COPYING_CCBYSA3
index fc45d7818..fc45d7818 100644
--- a/win32/icon/COPYING_CCBYSA3
+++ b/win32/resources/COPYING_CCBYSA3
diff --git a/win32/icon/Kbuild.src b/win32/resources/Kbuild.src
index 15e59e474..73fbfb7c7 100644
--- a/win32/icon/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -6,7 +6,7 @@
 
 obj-y :=
 
-obj-$(CONFIG_FEATURE_RESOURCES) += icon.o
+obj-$(CONFIG_FEATURE_RESOURCES) += resources.o
 
 # return commit level if available or 0
 bb_level = $(or $(word 2,$(subst -, ,$1)),0)
@@ -22,9 +22,9 @@ quiet_cmd_windres = WINDRES $@
 %.o: %.rc FORCE
         $(call if_changed,windres)
 
-win32/icon/icon.o: win32/icon/icon.rc .config
-win32/icon/icon.o: win32/icon/aterm.ico win32/icon/sterm.ico
-win32/icon/icon.o: win32/icon/busybox-w32.manifest
+win32/resources/resources.o: win32/resources/resources.rc .config
+win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico
+win32/resources/resources.o: win32/resources/busybox-w32.manifest
 
-win32/icon/busybox-w32.manifest: win32/icon/busybox-w32.manifest.src .config
-        @sed -b "s/VERSION/$(BB_VER)/" win32/icon/busybox-w32.manifest.src >win32/icon/busybox-w32.manifest
+win32/resources/busybox-w32.manifest: win32/resources/busybox-w32.manifest.src .config
+        @sed -b "s/VERSION/$(BB_VER)/" win32/resources/busybox-w32.manifest.src >win32/resources/busybox-w32.manifest
diff --git a/win32/icon/README b/win32/resources/README
index 33a245386..33a245386 100644
--- a/win32/icon/README
+++ b/win32/resources/README
diff --git a/win32/icon/aterm.ico b/win32/resources/aterm.ico
index e680216a2..e680216a2 100644
--- a/win32/icon/aterm.ico
+++ b/win32/resources/aterm.ico
diff --git a/win32/icon/busybox-w32.manifest.src b/win32/resources/busybox-w32.manifest.src
index c75dbdb96..c75dbdb96 100644
--- a/win32/icon/busybox-w32.manifest.src
+++ b/win32/resources/busybox-w32.manifest.src
diff --git a/win32/icon/dummy.c b/win32/resources/dummy.c
index e69de29bb..e69de29bb 100644
--- a/win32/icon/dummy.c
+++ b/win32/resources/dummy.c
diff --git a/win32/icon/icon.rc b/win32/resources/resources.rc
index 891f8a485..891f8a485 100644
--- a/win32/icon/icon.rc
+++ b/win32/resources/resources.rc
diff --git a/win32/icon/sterm.ico b/win32/resources/sterm.ico
index b9125b34d..b9125b34d 100644
--- a/win32/icon/sterm.ico
+++ b/win32/resources/sterm.ico