remove charset files (all of them are in UTF-8 now anyway)

change build system accordingly git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20650 b3059339-0415-0410-9bf9-f77b7e298cf2
2025-01-01 04:36:24 +01:00 · 2006-11-03 21:52:35 +00:00 · 2006-11-03 21:52:35 +00:00 · 630302ad63
commit 630302ad63
parent 157b4b952e
27 changed files with 4 additions and 31 deletions
--- a/2
+++ b/2
@ -443,7 +443,7 @@ help_mp.h: help/help_mp-en.h $(HELP_FILE)
 ifeq ($(CHARSET),)
 	@echo '#include "$(HELP_FILE)"' >> help_mp.h
 else
-	iconv -f `cat $(HELP_FILE).charset` -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
+	iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
 endif

 ifneq ($(HELP_FILE),help/help_mp-en.h)
--- a/8
+++ b/8
@ -7151,8 +7151,6 @@ if test "$_charset" = "noconv" ; then
  _charset=""
 elif test -z "$_charset" ; then
  if test "$_gtk1" = yes ; then
-    _charset=`cat ${_mp_help}.charset`
-  else
    _charset="UTF-8"
  fi
 fi
@ -7162,18 +7160,18 @@ else
  _def_charset="#undef MSG_CHARSET"
 fi

-if test "$_charset" = `cat ${_mp_help}.charset` ; then
+if test "$_charset" = "UTF-8" ; then
  # hack to disable conversion in the Makefile
  _charset=""
 fi

 if test "$_charset" ; then
 echocheck "iconv program"
-iconv -f `cat ${_mp_help}.charset` -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
+iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
 if test "$?" -ne 0 ; then
  echores "no"
    echo "No working iconv program found, use "
-    echo "--charset=`cat ${_mp_help}.charset` to continue anyway."
+    echo "--charset=UTF-8 to continue anyway."
    echo "If you also have problems with iconv library functions use --charset=noconv."
    echo "Messages in the GTK-2 interface will be broken then."
    exit 1
--- a/help/help_mp-bg.h.charset
+++ b/help/help_mp-bg.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-cs.h.charset
+++ b/help/help_mp-cs.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-de.h.charset
+++ b/help/help_mp-de.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-dk.h.charset
+++ b/help/help_mp-dk.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-el.h.charset
+++ b/help/help_mp-el.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-en.h.charset
+++ b/help/help_mp-en.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-es.h.charset
+++ b/help/help_mp-es.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-fr.h.charset
+++ b/help/help_mp-fr.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-hu.h.charset
+++ b/help/help_mp-hu.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-it.h.charset
+++ b/help/help_mp-it.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-ja.h.charset
+++ b/help/help_mp-ja.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-ko.h.charset
+++ b/help/help_mp-ko.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-mk.h.charset
+++ b/help/help_mp-mk.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-nb.h.charset
+++ b/help/help_mp-nb.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-nl.h.charset
+++ b/help/help_mp-nl.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-pl.h.charset
+++ b/help/help_mp-pl.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-pt_BR.h.charset
+++ b/help/help_mp-pt_BR.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-ro.h.charset
+++ b/help/help_mp-ro.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-ru.h.charset
+++ b/help/help_mp-ru.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-sk.h.charset
+++ b/help/help_mp-sk.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-sv.h.charset
+++ b/help/help_mp-sv.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-tr.h.charset
+++ b/help/help_mp-tr.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-uk.h.charset
+++ b/help/help_mp-uk.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-zh_CN.h.charset
+++ b/help/help_mp-zh_CN.h.charset
@ -1 +0,0 @@
-UTF-8
--- a/help/help_mp-zh_TW.h.charset
+++ b/help/help_mp-zh_TW.h.charset
@ -1 +0,0 @@
-UTF-8