net: Build language resource files separately.

Michael Stefaniuc mstefani at redhat.de
Wed Jul 1 17:28:54 CDT 2009


Do not include them from an other rc file.
---
 programs/net/Da.rc       |    2 ++
 programs/net/De.rc       |    4 ++--
 programs/net/En.rc       |    2 ++
 programs/net/Fr.rc       |    5 +++--
 programs/net/Ko.rc       |    2 ++
 programs/net/Lt.rc       |    4 ++--
 programs/net/Makefile.in |   14 +++++++++++++-
 programs/net/Nl.rc       |    2 ++
 programs/net/No.rc       |    2 ++
 programs/net/Pl.rc       |    2 ++
 programs/net/Pt.rc       |    2 ++
 programs/net/Ru.rc       |    2 ++
 programs/net/Si.rc       |    4 ++--
 programs/net/resources.h |    2 ++
 programs/net/rsrc.rc     |   36 ------------------------------------
 15 files changed, 40 insertions(+), 45 deletions(-)
 delete mode 100644 programs/net/rsrc.rc

diff --git a/programs/net/Da.rc b/programs/net/Da.rc
index 02694fd..3be4723 100644
--- a/programs/net/Da.rc
+++ b/programs/net/Da.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/net/De.rc b/programs/net/De.rc
index 78f87ec..0e2b0f3 100644
--- a/programs/net/De.rc
+++ b/programs/net/De.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
@@ -44,5 +46,3 @@ STRINGTABLE
     STRING_USE_HEADER, "\nStatus  Lokal   Entfernt\n---------------------------------------------------------------\n"
     STRING_USE_ENTRY,  "%s      %S      %S      Offene Ressourcen: %lu\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/net/En.rc b/programs/net/En.rc
index 54da5ed..49233a4 100644
--- a/programs/net/En.rc
+++ b/programs/net/En.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/net/Fr.rc b/programs/net/Fr.rc
index 3890649..49e6be4 100644
--- a/programs/net/Fr.rc
+++ b/programs/net/Fr.rc
@@ -18,6 +18,9 @@
  * 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 "resources.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -42,5 +45,3 @@ STRINGTABLE
     STRING_USE_HEADER, "\nStatut    Local   Distant\n---------------------------------------------------------------\n"
     STRING_USE_ENTRY, "%s      %S      %S      Ressources ouvertes : %lu\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc
index 44775d3..713edf8 100644
--- a/programs/net/Ko.rc
+++ b/programs/net/Ko.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/net/Lt.rc b/programs/net/Lt.rc
index 76893ae..7db5762 100644
--- a/programs/net/Lt.rc
+++ b/programs/net/Lt.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -45,5 +47,3 @@ STRINGTABLE
     STRING_USE_HEADER, "\nBÅ«sena  VietinÄ—   Nutolusi\n---------------------------------------------------------------\n"
     STRING_USE_ENTRY,  "%s      %S      %S      Atverti ištekliai: %lu\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in
index 8ababf7..4f6f6fc 100644
--- a/programs/net/Makefile.in
+++ b/programs/net/Makefile.in
@@ -8,7 +8,19 @@ IMPORTS   = netapi32 user32 advapi32 kernel32
 
 C_SRCS = net.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Fr.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ru.rc \
+	Si.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/net/Nl.rc b/programs/net/Nl.rc
index 93fa834..5f7e12b 100644
--- a/programs/net/Nl.rc
+++ b/programs/net/Nl.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/net/No.rc b/programs/net/No.rc
index bc0ad33..7cd0b57 100644
--- a/programs/net/No.rc
+++ b/programs/net/No.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
diff --git a/programs/net/Pl.rc b/programs/net/Pl.rc
index c5ef8a3..a60a5fe 100644
--- a/programs/net/Pl.rc
+++ b/programs/net/Pl.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/net/Pt.rc b/programs/net/Pt.rc
index 0efa8c2..0229cb9 100644
--- a/programs/net/Pt.rc
+++ b/programs/net/Pt.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/net/Ru.rc b/programs/net/Ru.rc
index 33da048..a59394b 100644
--- a/programs/net/Ru.rc
+++ b/programs/net/Ru.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/net/Si.rc b/programs/net/Si.rc
index 7130967..7a7e0cf 100644
--- a/programs/net/Si.rc
+++ b/programs/net/Si.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resources.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -44,5 +46,3 @@ STRINGTABLE
     STRING_USE_HEADER, "\nStanje  Lokalno   Oddaljeno\n---------------------------------------------------------------\n"
     STRING_USE_ENTRY,  "%s      %S      %S      Porabljena sredstva: %lu\n"
 }
-
-#pragma code_page(default)
diff --git a/programs/net/resources.h b/programs/net/resources.h
index c5199fd..659e47f 100644
--- a/programs/net/resources.h
+++ b/programs/net/resources.h
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
 #define STRING_USAGE              101
 #define STRING_START_USAGE        102
 #define STRING_STOP_USAGE         103
diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc
deleted file mode 100644
index 3f39391..0000000
--- a/programs/net/rsrc.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2007 Tim Schwartz
- *
- * 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 "resources.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Fr.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