[gimp] Bug 574018 - Add a manifest to executables

[Michael Schumacher <schumaml src gnome org>]

commit 82dca2ecf4030adba8119b81f477d25e06b986fa
Author: Michael Schumacher <schumaml gmx de>
Date:   Thu Aug 26 22:10:07 2010 +0200

    Bug 574018 - Add a manifest to executables
    
    Eventually all executables will have the manifest and version resources
    linked. In this initial step, the current resources are moved from the
    app/ directory to a global build/windows directory.

 Makefile.am                          |    3 ++-
 app/Makefile.am                      |   23 ++++++++---------------
 build/.gitignore                     |    2 ++
 build/Makefile.am                    |    2 ++
 build/windows/.gitignore             |    3 +++
 build/windows/Makefile.am            |    5 +++++
 {app => build/windows}/fileicon.ico  |  Bin 22486 -> 22486 bytes
 {app => build/windows}/gimp.manifest |    0
 {app => build/windows}/gimp.rc.in    |    6 +++---
 {app => build/windows}/wilber.ico    |  Bin 45046 -> 45046 bytes
 configure.ac                         |    4 +++-
 11 files changed, 28 insertions(+), 20 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 14e91a3..5fd12dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,8 @@ SUBDIRS = \
 	$(GIMP_PLUGINS)	\
 	etc		\
 	devel-docs	\
-	docs
+	docs		\
+	build
 
 bin_SCRIPTS = @GIMPINSTALL@
 
diff --git a/app/Makefile.am b/app/Makefile.am
index c301f78..53ac93a 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -85,11 +85,7 @@ gimp_2_7_SOURCES = $(libapp_sources) main.c
 
 
 EXTRA_DIST = \
-	fileicon.ico	\
-	gimp.manifest	\
-	gimp.rc.in	\
-	makefile.msc	\
-	wilber.ico
+	makefile.msc
 
 if OS_WIN32
 win32_ldflags = -mwindows $(WIN32_LARGE_ADDRESS_AWARE)
@@ -265,16 +261,6 @@ dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT)
 
 dist-hook: dist-check-gimp-console dist-dump-gimprc
 
-gimp.rc.o: gimp.rc
-	$(WINDRES) --define ORIGINALFILENAME_STR="gimp-2.7$(EXEEXT)" \
-		--define INTERNALNAME_STR="gimp-2.7" \
-		gimp.rc gimp.rc.o
-
-gimp-console.rc.o: gimp.rc
-	$(WINDRES) --define ORIGINALFILENAME_STR="gimp-console-2.7$(EXEEXT)" \
-		--define INTERNALNAME_STR="gimp-console-2.7" \
-		gimp.rc gimp-console.rc.o
-
 # If git is available, always check if git-version.h should be
 # updated. If git is not available, don't do anything if git-version.h
 # already exists because then we are probably working with a tarball
@@ -292,4 +278,11 @@ git-version.h: update-git-version-header
 	  echo "  git HEAD changed: $@ regenerated"; \
 	fi
 
+# Version resources for Microsoft Windows
+%.rc.o: $(top_srcdir)/build/windows/gimp.rc
+	$(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \
+		--define INTERNALNAME_STR="$*" \
+		--define TOP_SRCDIR="$(top_srcdir)" \
+		$< $@
+
 .PHONY: update-git-version-header
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..7259421
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
\ No newline at end of file
diff --git a/build/Makefile.am b/build/Makefile.am
new file mode 100644
index 0000000..097833f
--- /dev/null
+++ b/build/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = \
+	windows
\ No newline at end of file
diff --git a/build/windows/.gitignore b/build/windows/.gitignore
new file mode 100644
index 0000000..21e7f9d
--- /dev/null
+++ b/build/windows/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/gimp.rc
\ No newline at end of file
diff --git a/build/windows/Makefile.am b/build/windows/Makefile.am
new file mode 100644
index 0000000..6d7faf7
--- /dev/null
+++ b/build/windows/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = \
+	gimp.rc		\
+	gimp.manifest	\
+	fileicon.ico	\
+	wilber.ico
diff --git a/app/fileicon.ico b/build/windows/fileicon.ico
similarity index 100%
rename from app/fileicon.ico
rename to build/windows/fileicon.ico
diff --git a/app/gimp.manifest b/build/windows/gimp.manifest
similarity index 100%
rename from app/gimp.manifest
rename to build/windows/gimp.manifest
diff --git a/app/gimp.rc.in b/build/windows/gimp.rc.in
similarity index 91%
rename from app/gimp.rc.in
rename to build/windows/gimp.rc.in
index 6364386..0c2535f 100644
--- a/app/gimp.rc.in
+++ b/build/windows/gimp.rc.in
@@ -62,6 +62,6 @@ BEGIN
 END
 
 #include "winuser.h"
-1	ICON	"wilber.ico"
-2	ICON	"fileicon.ico"
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gimp.manifest"
+1	ICON	QUOTE(TOP_SRCDIR) "/build/windows/wilber.ico"
+2	ICON	QUOTE(TOP_SRCDIR) "/build/windows/fileicon.ico"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST QUOTE(TOP_SRCDIR) "/build/windows/gimp.manifest"
diff --git a/app/wilber.ico b/build/windows/wilber.ico
similarity index 100%
rename from app/wilber.ico
rename to build/windows/wilber.ico
diff --git a/configure.ac b/configure.ac
index 05b36e2..f40e4bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2017,7 +2017,6 @@ libgimpmath/Makefile
 libgimpmodule/Makefile
 libgimpthumb/Makefile
 libgimpwidgets/Makefile
-app/gimp.rc
 app/Makefile
 app/actions/Makefile
 app/base/Makefile
@@ -2049,6 +2048,9 @@ app/tests/gimpdir/Makefile
 app/tests/gimpdir/brushes/Makefile
 app/tests/gimpdir/gradients/Makefile
 app/tests/gimpdir/patterns/Makefile
+build/Makefile
+build/windows/Makefile
+build/windows/gimp.rc
 plug-ins/Makefile
 plug-ins/color-rotate/Makefile
 plug-ins/color-rotate/images/Makefile