[gimp] Bug 574018 - Add a manifest to executables
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Bug 574018 - Add a manifest to executables
- Date: Fri, 27 Aug 2010 19:32:45 +0000 (UTC)
commit 9781cf1523006aafb21c0a7f92a3c3b5faf41de7
Author: Michael Schumacher <schumaml gmx de>
Date: Fri Aug 27 21:13:03 2010 +0200
Bug 574018 - Add a manifest to executables
This step moves the %.rc.o pattern rule to a small include file in the
build/windows/ directory. Michael Natterer suggested this approach in
order to minimize the changes done to each executable's Makefile.am.
app/Makefile.am | 8 +-------
build/windows/Makefile.am | 1 +
build/windows/gimprc.rule | 6 ++++++
3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index 53ac93a..a09031b 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -96,6 +96,7 @@ munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
endif
if HAVE_WINDRES
+include $(top_srcdir)/build/windows/gimprc.rule
GIMPRC = gimp.rc.o
GIMPCONSOLERC = gimp-console.rc.o
endif
@@ -278,11 +279,4 @@ 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/windows/Makefile.am b/build/windows/Makefile.am
index 6d7faf7..185e1c6 100644
--- a/build/windows/Makefile.am
+++ b/build/windows/Makefile.am
@@ -1,4 +1,5 @@
EXTRA_DIST = \
+ gimprc.rule \
gimp.rc \
gimp.manifest \
fileicon.ico \
diff --git a/build/windows/gimprc.rule b/build/windows/gimprc.rule
new file mode 100644
index 0000000..6377d72
--- /dev/null
+++ b/build/windows/gimprc.rule
@@ -0,0 +1,6 @@
+# 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)" \
+ $< $@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]