[Gpa-commits] r759 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-07-15 18:38:55 +0200 (Sat, 15 Jul 2006)
New Revision: 759

Added:
   trunk/src/gpa-resource.rc
Removed:
   trunk/src/gpa.rc
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/Makefile.am
Log:
2006-07-15  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Check for windres.

src/
2006-07-15  Marcus Brinkmann  <marcus at g10code.de>

	* gpa.rc: Move to ...
	* gpa-resource.rc: ... here.  Update.
	* Makefile.am (gpa_SOURCES): Remove gpa.rc.
	(EXTRA_DIST): Add gpa-resource.rc.
	(gpa_LDFLAGS, gpa_DEPENDENCIES): New variables.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-15 11:21:05 UTC (rev 758)
+++ trunk/ChangeLog	2006-07-15 16:38:55 UTC (rev 759)
@@ -1,3 +1,7 @@
+2006-07-15  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Check for windres.
+
 2006-03-21  Werner Koch  <wk at g10code.com>
 
 	Released 0.7.3.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-07-15 11:21:05 UTC (rev 758)
+++ trunk/configure.ac	2006-07-15 16:38:55 UTC (rev 759)
@@ -140,6 +140,7 @@
 AC_ISC_POSIX
 AC_STDC_HEADERS
 AC_PROG_RANLIB
+AC_CHECK_TOOL(WINDRES, windres, :)
 
 if test -z "$GPG"; then
   AC_PATH_PROG(GPG, gpg)

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-07-15 11:21:05 UTC (rev 758)
+++ trunk/src/ChangeLog	2006-07-15 16:38:55 UTC (rev 759)
@@ -1,3 +1,11 @@
+2006-07-15  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpa.rc: Move to ...
+	* gpa-resource.rc: ... here.  Update.
+	* Makefile.am (gpa_SOURCES): Remove gpa.rc.
+	(EXTRA_DIST): Add gpa-resource.rc.
+	(gpa_LDFLAGS, gpa_DEPENDENCIES): New variables.
+
 2006-07-03  Werner Koch  <wk at g10code.com>
 
 	* gpa.ico: New. Converted from ../gpa.png by wwp.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2006-07-15 11:21:05 UTC (rev 758)
+++ trunk/src/Makefile.am	2006-07-15 16:38:55 UTC (rev 759)
@@ -5,13 +5,29 @@
 
 pkgdata_DATA = $(tip_files) $(logo)
 
-EXTRA_DIST = $(tip_files) $(logo) gpa.ico
+EXTRA_DIST = $(tip_files) $(logo) gpa.ico gpa-resource.rc
 
+if HAVE_W32_SYSTEM
+%.o : %.rc
+	$(WINDRES) `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+	sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -i $< -o $@
+
+gpa_res_ldflag = -Wl,gpa-resource.o
+gpa_deps = gpa-resource.o
+else
+gpa_res_ldflag =
+gpa_deps =
+endif
+
+
 bin_PROGRAMS = gpa
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/pixmaps
 LDADD = @LIBINTL@
 
+gpa_LDFLAGS = $(gpa_res_ldflag)
+gpa_DEPENDENCIES = $(gpa_deps)
+
 gpa_SOURCES = gpa.c gpa.h i18n.h options.h \
 	      gpawindowkeeper.c gpawindowkeeper.h \
 	      gtktools.c gtktools.h  \
@@ -74,4 +90,4 @@
 	      gpagenkeysimpleop.h gpagenkeysimpleop.c \
 	      gpabackupop.h gpabackupop.c \
 	      gpakeyselector.h gpakeyselector.c \
-	      options.c gpa.rc
+	      options.c

Copied: trunk/src/gpa-resource.rc (from rev 758, trunk/src/gpa.rc)
===================================================================
--- trunk/src/gpa.rc	2006-07-15 11:21:05 UTC (rev 758)
+++ trunk/src/gpa-resource.rc	2006-07-15 16:38:55 UTC (rev 759)
@@ -0,0 +1 @@
+1 ICON "gpa.ico"

Deleted: trunk/src/gpa.rc
===================================================================
--- trunk/src/gpa.rc	2006-07-15 11:21:05 UTC (rev 758)
+++ trunk/src/gpa.rc	2006-07-15 16:38:55 UTC (rev 759)
@@ -1 +0,0 @@
-IDI_GPA ICON DISCARDABLE "gpa.ico"