* Fixed Win32 port.
  * Fixed unnecessary target remake (recursive make is harmful !).

plugins/dvd/Makefile

@@ -10,6 +10,8 @@
 PLUGIN_DVD = dvd.o input_dvd.o dvd_ifo.o dvd_udf.o dvd_summary.o $(OBJ_DVD)
 BUILTIN_DVD = $(PLUGIN_DVD:%.o=BUILTIN_%.o)
 
+LIBDVDCSS_OBJ = ../../lib/libdvdcss.a ../../lib/libdvdcss.so
+
 ALL_OBJ = $(PLUGIN_DVD) $(BUILTIN_DVD)
 
 #
@@ -30,13 +32,16 @@ $(BUILTIN_DVD): BUILTIN_%.o: %.c
 # Real targets
 #
 
+# If we build our own libdvdcss
 ifeq (1,$(NEED_LIBDVDCSS))
-../dvd.so: libdvdcss $(PLUGIN_DVD)
+../dvd.so: $(LIBDVDCSS_OBJ) $(PLUGIN_DVD)
 	$(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
 
-../dvd.a: libdvdcss $(BUILTIN_DVD)
+../dvd.a: $(LIBDVDCSS_OBJ) $(BUILTIN_DVD)
 	ar r $@ $(BUILTIN_DVD)
 	$(RANLIB) $@
+
+# If we rely on an existing libdvdcss
 else
 ../dvd.so: $(PLUGIN_DVD)
 	$(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
@@ -46,6 +51,8 @@ else
 	$(RANLIB) $@
 endif
 
+$(LIBDVDCSS_OBJ): libdvdcss
+
 libdvdcss:
 	@cd ../../ && $(MAKE) libdvdcss
 

plugins/dvdread/Makefile

@@ -10,6 +10,9 @@
 PLUGIN_DVDREAD = dvdread.o input_dvdread.o $(OBJ_DVDREAD)
 BUILTIN_DVDREAD = $(PLUGIN_DVDREAD:%.o=BUILTIN_%.o)
 
+LIBDVDCSS_OBJ = ../../lib/libdvdcss.a ../../lib/libdvdcss.so
+LIBDVDREAD_OBJ = ../../lib/libdvdread.a ../../lib/libdvdread.so
+
 ALL_OBJ = $(PLUGIN_DVDREAD) $(BUILTIN_DVDREAD)
 
 #
@@ -31,23 +34,27 @@ $(BUILTIN_DVDREAD): BUILTIN_%.o: %.c
 #
 
 ifeq (1,$(NEED_LIBDVDCSS))
-../dvdread.so: libdvdcss libdvdread $(PLUGIN_DVDREAD)
+../dvdread.so: $(LIBDVDCSS_OBJ) $(LIBDVDREAD_OBJ) $(PLUGIN_DVDREAD)
 	$(CC) -o $@ $(PLUGIN_DVDREAD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
 
-../dvdread.a: libdvdcss libdvdread $(BUILTIN_DVDREAD)
+../dvdread.a: $(LIBDVDCSS_OBJ) $(LIBDVDREAD_OBJ) $(BUILTIN_DVDREAD)
 	ar r $@ $(BUILTIN_DVDREAD)
 	$(RANLIB) $@
 else
-../dvdread.so: libdvdread $(PLUGIN_DVDREAD)
+../dvdread.so: $(LIBDVDREAD_OBJ) $(PLUGIN_DVDREAD)
 	$(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
 
-../dvdread.a: libdvdread $(BUILTIN_DVDREAD)
+../dvdread.a: $(LIBDVDREAD_OBJ) $(BUILTIN_DVDREAD)
 	ar r $@ $(BUILTIN_DVDREAD)
 	$(RANLIB) $@
 endif
 
+$(LIBDVDCSS_OBJ): libdvdcss
+
 libdvdcss:
 	@cd ../../ && $(MAKE) libdvdcss
 
+$(LIBDVDREAD_OBJ): libdvdread
+
 libdvdread:
 	@cd ../../ && $(MAKE) libdvdread

src/interface/main.c

@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.136 2001/12/12 02:13:50 sam Exp $
+ * $Id: main.c,v 1.137 2001/12/12 15:20:16 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -290,14 +290,14 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     /* 
      * Support for getext
      */
-#ifdef HAVE_LOCALE_H
-    if( ! setlocale(LC_MESSAGES, "") )
+#if defined( HAVE_LOCALE_H ) && defined( HAVE_LC_MESSAGES )
+    if( !setlocale( LC_MESSAGES, "" ) )
     {
         fprintf( stderr, "warning: unsupported locale.\n" );
     }
 #endif
 
-    if( ! bindtextdomain(PACKAGE, LOCALEDIR) )
+    if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
     {
         fprintf( stderr, "warning: no domain %s in directory %s\n",
                  PACKAGE, LOCALEDIR );