reg: Build language resource files separately.

Michael Stefaniuc mstefani at redhat.de
Wed Jul 1 17:29:26 CDT 2009


Do not include them from an other rc file.
---
 programs/reg/Da.rc       |    2 ++
 programs/reg/De.rc       |    4 ++--
 programs/reg/En.rc       |    2 ++
 programs/reg/Fr.rc       |    2 ++
 programs/reg/Ja.rc       |    4 ++--
 programs/reg/Ko.rc       |    2 ++
 programs/reg/Lt.rc       |    4 ++--
 programs/reg/Makefile.in |   15 ++++++++++++++-
 programs/reg/Nl.rc       |    2 ++
 programs/reg/No.rc       |    2 ++
 programs/reg/Pl.rc       |    2 ++
 programs/reg/Pt.rc       |    2 ++
 programs/reg/Ru.rc       |    2 ++
 programs/reg/Si.rc       |    4 ++--
 programs/reg/reg.h       |    2 ++
 programs/reg/rsrc.rc     |   37 -------------------------------------
 16 files changed, 42 insertions(+), 46 deletions(-)
 delete mode 100644 programs/reg/rsrc.rc

diff --git a/programs/reg/Da.rc b/programs/reg/Da.rc
index c385d0a..353b94d 100644
--- a/programs/reg/Da.rc
+++ b/programs/reg/Da.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/reg/De.rc b/programs/reg/De.rc
index 9768c60..0940640 100644
--- a/programs/reg/De.rc
+++ b/programs/reg/De.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -36,5 +38,3 @@ STRINGTABLE
     STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum remote Rechner hinzufügen\n"
     STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/reg/En.rc b/programs/reg/En.rc
index e713416..10cfa2b 100644
--- a/programs/reg/En.rc
+++ b/programs/reg/En.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc
index 671ebf6..cb5de82 100644
--- a/programs/reg/Fr.rc
+++ b/programs/reg/Fr.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/reg/Ja.rc b/programs/reg/Ja.rc
index 9163132..a2c1434 100644
--- a/programs/reg/Ja.rc
+++ b/programs/reg/Ja.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -31,5 +33,3 @@ STRINGTABLE
     STRING_DELETE_USAGE, "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n"
     STRING_QUERY_USAGE, "REG QUERY キー名 [/v 値名 | /ve] [/s]\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc
index e9ebbee..46efd91 100644
--- a/programs/reg/Ko.rc
+++ b/programs/reg/Ko.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/reg/Lt.rc b/programs/reg/Lt.rc
index d0e0fe3..98aea18 100644
--- a/programs/reg/Lt.rc
+++ b/programs/reg/Lt.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -36,5 +38,3 @@ STRINGTABLE
     STRING_NO_REMOTE, "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n"
     STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in
index 6fb05f1..de4d2c8 100644
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@@ -10,7 +10,20 @@ DELAYIMPORTS = user32
 
 C_SRCS = reg.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Fr.rc \
+	Ja.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ru.rc \
+	Si.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc
index c6a89f1..c34e395 100644
--- a/programs/reg/Nl.rc
+++ b/programs/reg/Nl.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/reg/No.rc b/programs/reg/No.rc
index 5b9a33d..5ad032d 100644
--- a/programs/reg/No.rc
+++ b/programs/reg/No.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
diff --git a/programs/reg/Pl.rc b/programs/reg/Pl.rc
index 51ae0e1..01c4244 100644
--- a/programs/reg/Pl.rc
+++ b/programs/reg/Pl.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/reg/Pt.rc b/programs/reg/Pt.rc
index 2918883..6294408 100644
--- a/programs/reg/Pt.rc
+++ b/programs/reg/Pt.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc
index 0d895a3..8e07c4c 100644
--- a/programs/reg/Ru.rc
+++ b/programs/reg/Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/reg/Si.rc b/programs/reg/Si.rc
index 84a339a..6f3e01c 100644
--- a/programs/reg/Si.rc
+++ b/programs/reg/Si.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "reg.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -35,5 +37,3 @@ STRINGTABLE
     STRING_NO_REMOTE, "Napaka: Na morem dodati ključa na oddaljen računalnik\n"
     STRING_CANNOT_FIND, "Napaka: Sistem ni našel zahtevanega ključa ali vrednosti\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/reg/reg.h b/programs/reg/reg.h
index 6d4ae47..2221647 100644
--- a/programs/reg/reg.h
+++ b/programs/reg/reg.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
 /* Translation IDs. */
 #define STRING_USAGE            101
 #define STRING_ADD_USAGE        102
diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc
deleted file mode 100644
index aa70a4b..0000000
--- a/programs/reg/rsrc.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2008 Andrew Riedi
- *
- * 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 "reg.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Fr.rc"
-#include "Ja.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"
-- 
1.6.3.3



More information about the wine-patches mailing list