xcopy: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Wed Jul 1 17:32:13 CDT 2009
Do not include them from an other rc file.
---
programs/xcopy/Da.rc | 1 +
programs/xcopy/De.rc | 1 +
programs/xcopy/En.rc | 1 +
programs/xcopy/Fr.rc | 5 +++--
programs/xcopy/Ko.rc | 1 +
programs/xcopy/Lt.rc | 4 ++--
programs/xcopy/Makefile.in | 14 +++++++++++++-
programs/xcopy/Nl.rc | 1 +
programs/xcopy/No.rc | 1 +
programs/xcopy/Pl.rc | 1 +
programs/xcopy/Pt.rc | 1 +
programs/xcopy/Ru.rc | 1 +
programs/xcopy/Si.rc | 4 ++--
programs/xcopy/rsrc.rc | 36 ------------------------------------
programs/xcopy/xcopy.h | 2 ++
15 files changed, 31 insertions(+), 43 deletions(-)
delete mode 100644 programs/xcopy/rsrc.rc
diff --git a/programs/xcopy/Da.rc b/programs/xcopy/Da.rc
index 239b3a7..6a15a44 100644
--- a/programs/xcopy/Da.rc
+++ b/programs/xcopy/Da.rc
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
diff --git a/programs/xcopy/De.rc b/programs/xcopy/De.rc
index 1af6418..6192c52 100644
--- a/programs/xcopy/De.rc
+++ b/programs/xcopy/De.rc
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
diff --git a/programs/xcopy/En.rc b/programs/xcopy/En.rc
index 33324ac..83ef291 100644
--- a/programs/xcopy/En.rc
+++ b/programs/xcopy/En.rc
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
diff --git a/programs/xcopy/Fr.rc b/programs/xcopy/Fr.rc
index 7fe8f69..b28dffe 100644
--- a/programs/xcopy/Fr.rc
+++ b/programs/xcopy/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 "xcopy.h"
+
#pragma code_page(65001)
@@ -78,5 +81,3 @@ Où :\n\
\t\tque le fichier source\n\n"
}
-
-#pragma code_page(default)
diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc
index a3a89f9..6a5071c 100644
--- a/programs/xcopy/Ko.rc
+++ b/programs/xcopy/Ko.rc
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
diff --git a/programs/xcopy/Lt.rc b/programs/xcopy/Lt.rc
index 6d538d9..182a39a 100644
--- a/programs/xcopy/Lt.rc
+++ b/programs/xcopy/Lt.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -79,5 +81,3 @@ Kur:\n\
\t\tsenesnis už Å¡altinio failÄ
\n\n"
}
-
-#pragma code_page(default)
diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in
index 7e9b26e..b46a97f 100644
--- a/programs/xcopy/Makefile.in
+++ b/programs/xcopy/Makefile.in
@@ -12,7 +12,19 @@ MODCFLAGS = @BUILTINFLAG@
C_SRCS = \
xcopy.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/xcopy/Nl.rc b/programs/xcopy/Nl.rc
index f994cdd..b9db305 100644
--- a/programs/xcopy/Nl.rc
+++ b/programs/xcopy/Nl.rc
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
diff --git a/programs/xcopy/No.rc b/programs/xcopy/No.rc
index ddcccf7..a3c223f 100644
--- a/programs/xcopy/No.rc
+++ b/programs/xcopy/No.rc
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
diff --git a/programs/xcopy/Pl.rc b/programs/xcopy/Pl.rc
index 3d094a9..8b224ec 100644
--- a/programs/xcopy/Pl.rc
+++ b/programs/xcopy/Pl.rc
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
diff --git a/programs/xcopy/Pt.rc b/programs/xcopy/Pt.rc
index 47e9609..d8254d5 100644
--- a/programs/xcopy/Pt.rc
+++ b/programs/xcopy/Pt.rc
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
diff --git a/programs/xcopy/Ru.rc b/programs/xcopy/Ru.rc
index 1d86ff4..3983457 100644
--- a/programs/xcopy/Ru.rc
+++ b/programs/xcopy/Ru.rc
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
diff --git a/programs/xcopy/Si.rc b/programs/xcopy/Si.rc
index 092282c..1013837 100644
--- a/programs/xcopy/Si.rc
+++ b/programs/xcopy/Si.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "xcopy.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -78,5 +80,3 @@ Where:\n\
\t\tod izvora\n\n"
}
-
-#pragma code_page(default)
diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc
deleted file mode 100644
index 7161a79..0000000
--- a/programs/xcopy/rsrc.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2007 Jason Edmeades
- *
- * 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 "xcopy.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"
diff --git a/programs/xcopy/xcopy.h b/programs/xcopy/xcopy.h
index ee4bd91..1c93395 100644
--- a/programs/xcopy/xcopy.h
+++ b/programs/xcopy/xcopy.h
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <windef.h>
+
/* Local #defines */
#define RC_OK 0
#define RC_NOFILES 1
--
1.6.3.3
More information about the wine-patches
mailing list