/pidgin/main: f79a5a517996: cross-win32: don't use version.h inc...

[Tomasz Wasilczyk]

Changeset: f79a5a5179960f57a09077968ade2d3f9eea3fa9
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-24 00:53 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/f79a5a517996

Description:

cross-win32: don't use version.h includes in rc files

diffstat:

 finch/Makefile.am                 |  2 +-
 finch/finch_winres.rc.in          |  5 ++---
 finch/libfinch_winres.rc.in       |  5 ++---
 libpurple/Makefile.am             |  2 +-
 libpurple/win32/libpurplerc.rc.in |  5 ++---
 pidgin/Makefile.am                |  2 +-
 pidgin/win32/pidgin_dll_rc.rc.in  |  5 ++---
 pidgin/win32/pidgin_exe_rc.rc.in  |  5 ++---
 8 files changed, 13 insertions(+), 18 deletions(-)

diffs (113 lines):

diff --git a/finch/Makefile.am b/finch/Makefile.am
--- a/finch/Makefile.am
+++ b/finch/Makefile.am
@@ -93,7 +93,7 @@ libfinch_la_LIBADD += \
 	-lwinmm
 
 .rc.o: %.rc
-	$(AM_V_GEN)$(WINDRES) -I$(top_srcdir)/libpurple -i $< -o $@
+	$(AM_V_GEN)$(WINDRES) -i $< -o $@
 
 FINCH_WIN32RES = finch_winres.o
 finch_DEPENDENCIES += $(FINCH_WIN32RES)
diff --git a/finch/finch_winres.rc.in b/finch/finch_winres.rc.in
--- a/finch/finch_winres.rc.in
+++ b/finch/finch_winres.rc.in
@@ -1,9 +1,8 @@
 #include <winver.h>
-#include "version.h"
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
-  PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
+  FILEVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
+  PRODUCTVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
diff --git a/finch/libfinch_winres.rc.in b/finch/libfinch_winres.rc.in
--- a/finch/libfinch_winres.rc.in
+++ b/finch/libfinch_winres.rc.in
@@ -1,9 +1,8 @@
 #include <winver.h>
-#include "version.h"
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
-  PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
+  FILEVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
+  PRODUCTVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -219,7 +219,7 @@ purple_coreheaders += \
 	win32/wpurpleerror.h
 
 .rc.o: %.rc
-	$(AM_V_GEN)$(WINDRES) -I$(top_srcdir)/libpurple -i $< -o $@
+	$(AM_V_GEN)$(WINDRES) -i $< -o $@
 
 LIBPURPLE_WIN32RES = win32/libpurplerc.o
 LIBPURPLE_WIN32RES_LDFLAGS = -Wl,$(LIBPURPLE_WIN32RES)
diff --git a/libpurple/win32/libpurplerc.rc.in b/libpurple/win32/libpurplerc.rc.in
--- a/libpurple/win32/libpurplerc.rc.in
+++ b/libpurple/win32/libpurplerc.rc.in
@@ -1,9 +1,8 @@
 #include <winver.h>
-#include "version.h"
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
-  PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
+  FILEVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
+  PRODUCTVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -167,7 +167,7 @@ libpidgin_la_headers += \
 	win32/wspell.h
 
 .rc.o: %.rc
-	$(AM_V_GEN)$(WINDRES) -I$(top_srcdir)/libpurple -i $< -o $@
+	$(AM_V_GEN)$(WINDRES) -i $< -o $@
 
 LIBPIDGIN_WIN32RES = win32/pidgin_dll_rc.o
 LIBPIDGIN_WIN32RES_LDFLAGS = -Wl,$(LIBPIDGIN_WIN32RES)
diff --git a/pidgin/win32/pidgin_dll_rc.rc.in b/pidgin/win32/pidgin_dll_rc.rc.in
--- a/pidgin/win32/pidgin_dll_rc.rc.in
+++ b/pidgin/win32/pidgin_dll_rc.rc.in
@@ -1,10 +1,9 @@
 #include <winver.h>
-#include "version.h"
 #include "resource.h"
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
-  PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
+  FILEVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
+  PRODUCTVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
diff --git a/pidgin/win32/pidgin_exe_rc.rc.in b/pidgin/win32/pidgin_exe_rc.rc.in
--- a/pidgin/win32/pidgin_exe_rc.rc.in
+++ b/pidgin/win32/pidgin_exe_rc.rc.in
@@ -1,10 +1,9 @@
 #include <winver.h>
 #include "resource.h"
-#include "version.h"
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
-  PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
+  FILEVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
+  PRODUCTVERSION @PURPLE_MAJOR_VERSION@, at PURPLE_MINOR_VERSION@, at PURPLE_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32