* Fix Makefiles for removed .rle fonts

diff --git a/Makefile.am b/Makefile.am
index c67e693738794b946befab510b0780786a8b7a68..110a0f972c09444c01d168f7e487ceec8adb8208 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -404,7 +404,6 @@ VLC.app: vlc
            "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
          fi ; done
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
-       $(INSTALL) -m 644 $(srcdir)/share/*.rle $(srcdir)/VLC.app/Contents/MacOS/share
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http
        $(INSTALL) -m 644 $(srcdir)/share/http/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http/admin
@@ -528,7 +527,6 @@ package-beos:
          cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
        done
        mkdir -p $(srcdir)/tmp/vlc/share
-       cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
 
 # Create package with debug symbols
        mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*

diff --git a/modules/codec/subsdec/subsdec.c b/modules/codec/subsdec/subsdec.c
index 75efe64000bfc04cae77036bdeca7451427a7364..fcc04653c9d7e45b7ec9e679a09cb87219f78e5c 100644 (file)
--- a/modules/codec/subsdec/subsdec.c
+++ b/modules/codec/subsdec/subsdec.c
@@ -2,7 +2,7 @@
  * subsdec.c : SPU decoder thread
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: subsdec.c,v 1.1 2003/07/22 20:49:10 hartman Exp $
+ * $Id: subsdec.c,v 1.2 2003/07/22 22:02:44 hartman Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -72,6 +72,7 @@ vlc_module_begin();
     set_description( _("file subtitles decoder") );
     set_capability( "decoder", 50 );
     set_callbacks( OpenDecoder, NULL );
+    add_category_hint( N_("Subtitles"), NULL, VLC_FALSE );
 
 #if defined(HAVE_ICONV)
     add_string_from_list( "subsdec-encoding", "ISO-8859-1", ppsz_encodings, NULL,
@@ -105,7 +106,6 @@ static int OpenDecoder( vlc_object_t *p_this )
 static int RunDecoder( decoder_fifo_t * p_fifo )
 {
     subsdec_thread_t *    p_subsdec;
-    vout_thread_t *       p_vout_backup = NULL;
 
     /* Allocate the memory needed to store the thread's structure */
     p_subsdec = (subsdec_thread_t *)malloc( sizeof(subsdec_thread_t) );

diff --git a/share/Makefile.am b/share/Makefile.am
index 6e0f4c76e0cd14470fd4966e1b92ab2b287666cf..0571d996c4fbfd02d441d6eaf89eaa0ade7eeb2e 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -5,8 +5,6 @@ EXTRA_DIST = $(DIST_rsrc) $(DIST_fonts)
 pkgdatadir = $(datadir)/vlc
 
 dist_pkgdata_DATA = \
-       font-eutopiabold21.rle \
-       font-eutopiabold36.rle \
        $(DIST_familiar) \
        $(DIST_icons16) \
        $(DIST_icons32) \
@@ -17,10 +15,6 @@ nobase_dist_pkgdata_DATA = \
        $(DIST_skins)
 
 DIST_fonts = \
-       default8x16.psf \
-       default8x9.psf \
-       font-eutopiabold21.rle \
-       font-eutopiabold36.rle \
        $(NULL)
 
 DIST_rsrc = \