From b4b74945848aff46ef9903f518aab625da4260e2 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Fri, 3 Jul 2009 01:36:09 +0200
Subject: [PATCH] progman: Build language resource files separately.

Do not include them from an other rc file.
---
 programs/progman/Cs.rc       |  2 ++
 programs/progman/Da.rc       |  2 ++
 programs/progman/De.rc       |  2 ++
 programs/progman/En.rc       |  2 ++
 programs/progman/Es.rc       |  2 ++
 programs/progman/Fr.rc       |  2 ++
 programs/progman/Hu.rc       |  2 ++
 programs/progman/It.rc       |  2 ++
 programs/progman/Ko.rc       |  2 ++
 programs/progman/Lt.rc       |  4 ++--
 programs/progman/Makefile.in | 22 +++++++++++++++++-
 programs/progman/Nl.rc       |  2 ++
 programs/progman/No.rc       |  2 ++
 programs/progman/Pl.rc       |  2 ++
 programs/progman/Pt.rc       |  2 ++
 programs/progman/Ru.rc       |  2 ++
 programs/progman/Si.rc       |  4 ++--
 programs/progman/Sv.rc       |  2 ++
 programs/progman/Tr.rc       |  2 ++
 programs/progman/Zh.rc       |  4 ++--
 programs/progman/accel.rc    |  3 +++
 programs/progman/progman.h   |  3 ++-
 programs/progman/rsrc.rc     | 43 ------------------------------------
 23 files changed, 64 insertions(+), 51 deletions(-)
 delete mode 100644 programs/progman/rsrc.rc

diff --git a/programs/progman/Cs.rc b/programs/progman/Cs.rc
index 07838b000c3..06139b928a9 100644
--- a/programs/progman/Cs.rc
+++ b/programs/progman/Cs.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Czech strings in CP1250 */
 
 /* Menu */
diff --git a/programs/progman/Da.rc b/programs/progman/Da.rc
index b99c5f59ee3..7e1438d71e1 100644
--- a/programs/progman/Da.rc
+++ b/programs/progman/Da.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 /* Menu */
diff --git a/programs/progman/De.rc b/programs/progman/De.rc
index c94328cd425..b72118f9319 100644
--- a/programs/progman/De.rc
+++ b/programs/progman/De.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
diff --git a/programs/progman/En.rc b/programs/progman/En.rc
index 201decae5c4..bd6aaaa4f6c 100644
--- a/programs/progman/En.rc
+++ b/programs/progman/En.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
diff --git a/programs/progman/Es.rc b/programs/progman/Es.rc
index 391a5e58236..28883540335 100644
--- a/programs/progman/Es.rc
+++ b/programs/progman/Es.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 /* Menu */
diff --git a/programs/progman/Fr.rc b/programs/progman/Fr.rc
index 39b34617e6c..80ff46690b1 100644
--- a/programs/progman/Fr.rc
+++ b/programs/progman/Fr.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 /* Menu */
diff --git a/programs/progman/Hu.rc b/programs/progman/Hu.rc
index 678d68d2e1c..9d53fb39c5e 100644
--- a/programs/progman/Hu.rc
+++ b/programs/progman/Hu.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
diff --git a/programs/progman/It.rc b/programs/progman/It.rc
index 0c280f58d0e..9e3437d2e03 100644
--- a/programs/progman/It.rc
+++ b/programs/progman/It.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc
index 6c749f2935a..5c2cdd17d69 100644
--- a/programs/progman/Ko.rc
+++ b/programs/progman/Ko.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
diff --git a/programs/progman/Lt.rc b/programs/progman/Lt.rc
index ac550544825..d484c55c7ae 100644
--- a/programs/progman/Lt.rc
+++ b/programs/progman/Lt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 /* UTF-8 */
@@ -240,5 +242,3 @@ GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \
 UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \
 bendrojoje viešojoje licencijoje."
 }
-
-#pragma code_page(default)
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index 9ed785910e7..921f9a81c0b 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -14,7 +14,27 @@ C_SRCS = \
 	program.c \
 	string.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	Cs.rc \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Es.rc \
+	Fr.rc \
+	Hu.rc \
+	It.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc \
+	accel.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc
index 7b8c8d0f913..b2ca361b8cc 100644
--- a/programs/progman/Nl.rc
+++ b/programs/progman/Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
diff --git a/programs/progman/No.rc b/programs/progman/No.rc
index 1af4170bf2d..618e985daed 100644
--- a/programs/progman/No.rc
+++ b/programs/progman/No.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
diff --git a/programs/progman/Pl.rc b/programs/progman/Pl.rc
index 626618cefcf..351930cc384 100644
--- a/programs/progman/Pl.rc
+++ b/programs/progman/Pl.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
  LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
diff --git a/programs/progman/Pt.rc b/programs/progman/Pt.rc
index 227b767d9ca..98e4b86d09c 100644
--- a/programs/progman/Pt.rc
+++ b/programs/progman/Pt.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 /* Menu */
diff --git a/programs/progman/Ru.rc b/programs/progman/Ru.rc
index 90d6302210a..7d6121b44d7 100644
--- a/programs/progman/Ru.rc
+++ b/programs/progman/Ru.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
diff --git a/programs/progman/Si.rc b/programs/progman/Si.rc
index 1d394fd1192..17447050681 100644
--- a/programs/progman/Si.rc
+++ b/programs/progman/Si.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 #pragma code_page(65001)
 
 /* Menu */
@@ -244,5 +246,3 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of \
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
 Lesser General Public License for more details."
 }
-
-#pragma code_page(default)
diff --git a/programs/progman/Sv.rc b/programs/progman/Sv.rc
index be434974c5d..0d23948a270 100644
--- a/programs/progman/Sv.rc
+++ b/programs/progman/Sv.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
diff --git a/programs/progman/Tr.rc b/programs/progman/Tr.rc
index a2963310b42..6407acd8539 100644
--- a/programs/progman/Tr.rc
+++ b/programs/progman/Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
diff --git a/programs/progman/Zh.rc b/programs/progman/Zh.rc
index d42a3f29595..d78ac760760 100644
--- a/programs/progman/Zh.rc
+++ b/programs/progman/Zh.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "progman.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -410,5 +412,3 @@ IDS_LIBRARIES_DLL,		"動態連接庫 (*.dll)"
 IDS_SYMBOL_FILES,		"圖標檔案"
 IDS_SYMBOLS_ICO,		"圖標 (*.ico)"
 }
-
-#pragma code_page(default)
diff --git a/programs/progman/accel.rc b/programs/progman/accel.rc
index c86c0f39fa7..44edae535c4 100644
--- a/programs/progman/accel.rc
+++ b/programs/progman/accel.rc
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <winuser.h>
+#include "progman.h"
+
 ACCEL ACCELERATORS
 {
 VK_RETURN, PM_EXECUTE, VIRTKEY, ALT
diff --git a/programs/progman/progman.h b/programs/progman/progman.h
index 5f7504ba6ce..aa22c6d14a2 100644
--- a/programs/progman/progman.h
+++ b/programs/progman/progman.h
@@ -26,7 +26,8 @@
 #define MAX_PATHNAME_LEN    1024
 #define MAX_LANGUAGE_NUMBER (PM_LAST_LANGUAGE - PM_FIRST_LANGUAGE)
 
-#include "windows.h"
+#include <windows.h>
+#include <windef.h>
 
 /* Fallback icon */
 #define DEFAULTICON OIC_WINLOGO
diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc
deleted file mode 100644
index 167c20154b7..00000000000
--- a/programs/progman/rsrc.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 1996 Ulrich Schmid
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <windef.h>
-#include <winuser.h>
-
-#include "progman.h"
-#include "accel.rc"
-
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "Hu.rc"
-#include "It.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"