Use only one .res file.

diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in
index 96ab0eb6c61e8fb671e13ee6a228d4f974dd7036..2f8fedca560ca46ba57f7a9fed2c60720a644bd8 100644 (file)
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@@ -14,10 +14,7 @@ C_SRCS = \
        pwcache.c \
        wnet.c
 
-RC_SRCS = \
-       mpr.rc \
-       version.rc
-
+RC_SRCS = mpr.rc
 
 @MAKE_DLL_RULES@
 

diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc
index efaf3ae81e5ef07061fbe87ae537f0c7a38d5e19..10bae36403f6e0ee657312816fba2edaed91cb47 100644 (file)
--- a/dlls/mpr/mpr.rc
+++ b/dlls/mpr/mpr.rc
@@ -21,6 +21,8 @@
 #include "winbase.h"
 #include "mprres.h"
 
+#include "version.rc"
+
 #include "mpr_Cs.rc"
 #include "mpr_De.rc"
 #include "mpr_En.rc"

diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 533f8ab4b37c5a273cf024c71759eafebb90c42b..9e1170351d3ef980996b5e8432a3474301460a1c 100644 (file)
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -53,7 +53,7 @@ SPEC_SRCS16 = \
        ole2thk.spec \
        storage.spec
 
-RC_SRCS = ole32res.rc version.rc
+RC_SRCS = ole32res.rc
 RC_BINSRC = ole32res.rc
 RC_BINARIES = \
        drag_copy.cur \

diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc
index 6546fc2a7ba54eb33ba134b070bdc2f7cd73fbfa..cc4c0b2525475ad35a3ec020d11e121e3757273e 100644 (file)
--- a/dlls/ole32/ole32res.rc
+++ b/dlls/ole32/ole32res.rc
@@ -23,6 +23,8 @@
 #include "winuser.h"
 #include "winnls.h"
 
+#include "version.rc"
+
 /*
  * Everything that does not depend on language,
  * like textless bitmaps etc, go into the

diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 14e272dda53226e2a9223c24ee6528a504fd07fb..428c9e85356f5976dd00bd62d99f65650ef2953f 100644 (file)
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -35,9 +35,7 @@ SPEC_SRCS16 = \
        ole2disp.spec \
        typelib.spec
 
-RC_SRCS = \
-       oleaut32.rc \
-       version.rc
+RC_SRCS = oleaut32.rc
 
 SUBDIRS = tests
 

diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc
index 641f3924d981e0d6ee4442b9388dfd7355294756..fcff4f6e541a92a650178921d6ff07d94c6a0615 100644 (file)
--- a/dlls/oleaut32/oleaut32.rc
+++ b/dlls/oleaut32/oleaut32.rc
@@ -22,6 +22,8 @@
 #include "winbase.h"
 #include "resource.h"
 
+#include "version.rc"
+
 #include "oleaut32_De.rc"
 #include "oleaut32_Dk.rc"
 #include "oleaut32_En.rc"

diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index e9d2c944d4bb16d63ace53606905ef1b33b5e812..50291512f4c8c09156202b3955eb2f7b782381e6 100644 (file)
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -48,7 +48,7 @@ C_SRCS = \
        shv_item_cmenu.c \
        systray.c
 
-RC_SRCS = shres.rc version.rc
+RC_SRCS = shres.rc
 RC_BINSRC = shres.rc
 RC_BINARIES = \
        cdrom.ico \

diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index c9f7026f4ae849bef0101a73b15c026b3221c058..ddc12417d9006e1b1793e6785d45941568666612 100644 (file)
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -26,6 +26,8 @@
 #include "shlobj.h"
 #include "shresdef.h"
 
+#include "version.rc"
+
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 shv_accel ACCELERATORS