* Fixed an issue in Makefile.dep causing to rebuild unnecessary files
    in the gtk/gnome and x11/xvideo plugins.
  * Fixed CFLAGS_XVIDEO.

Makefile.dep

@@ -45,6 +45,8 @@ default:
 
 -include $(MAKECMDGOALS)
 
+CFLAGS += -DMAKE_DEP
+
 $(C_DEP): .dep/%.d: %.c
 	@test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*)
 	@echo "regenerating dependencies for $*.c"

Makefile.opts.in

@@ -108,6 +108,7 @@ CFLAGS_GTK = @CFLAGS_GTK@
 CFLAGS_MAD = @CFLAGS_MAD@
 CFLAGS_SDL = @CFLAGS_SDL@
 CFLAGS_X11 = @CFLAGS_X11@
+CFLAGS_XVIDEO = @CFLAGS_XVIDEO@
 
 #
 # Additional objects

configure

@@ -7671,7 +7671,7 @@ EOF
  
     BUILTINS="${BUILTINS} xvideo"
     LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
-    CFLAGS_X11="-I$x_includes"
+    CFLAGS_XVIDEO="-I$x_includes"
   
   CPPFLAGS=$saved_CPPFLAGS
 else
@@ -7849,6 +7849,7 @@ fi
 
 
 
+
 
 
 trap '' 1 2 15
@@ -8101,6 +8102,7 @@ s%@CFLAGS_GTK@%$CFLAGS_GTK%g
 s%@CFLAGS_MAD@%$CFLAGS_MAD%g
 s%@CFLAGS_SDL@%$CFLAGS_SDL%g
 s%@CFLAGS_X11@%$CFLAGS_X11%g
+s%@CFLAGS_XVIDEO@%$CFLAGS_XVIDEO%g
 s%@OBJ_DVD@%$OBJ_DVD%g
 s%@OBJ_LIBDVDCSS@%$OBJ_LIBDVDCSS%g
 s%@NEED_LIBDVDCSS@%$NEED_LIBDVDCSS%g

configure.in

@@ -1179,7 +1179,7 @@ if test x$enable_xvideo != xno &&
   AC_CHECK_HEADERS(X11/extensions/Xv.h, [
     BUILTINS="${BUILTINS} xvideo"
     LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
-    CFLAGS_X11="-I$x_includes"
+    CFLAGS_XVIDEO="-I$x_includes"
   ]
   CPPFLAGS=$saved_CPPFLAGS)
 fi
@@ -1284,6 +1284,7 @@ AC_SUBST(CFLAGS_GTK)
 AC_SUBST(CFLAGS_MAD)
 AC_SUBST(CFLAGS_SDL)
 AC_SUBST(CFLAGS_X11)
+AC_SUBST(CFLAGS_XVIDEO)
 
 AC_SUBST(OBJ_DVD)
 AC_SUBST(OBJ_LIBDVDCSS)

include/modules_inner.h

@@ -2,7 +2,7 @@
  * modules_inner.h : Macros used from within a module.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules_inner.h,v 1.8 2001/12/10 04:53:10 sam Exp $
+ * $Id: modules_inner.h,v 1.9 2001/12/11 15:31:37 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,7 +24,7 @@
 /*****************************************************************************
  * Check that we are within a module.
  *****************************************************************************/
-#ifndef MODULE_NAME
+#if !( defined( MODULE_NAME ) || defined( MAKE_DEP ) )
 #  error "You must define MODULE_NAME before using modules_inner.h !"
 #endif
 

plugins/x11/Makefile

@@ -25,27 +25,29 @@ ALL_OBJ = $(PLUGIN_X11) $(PLUGIN_XVIDEO) $(PLUGIN_COMMON) \
 
 include ../../Makefile.modules
 
-# X11
+# X11 plugin
 $(PLUGIN_X11) $(PLUGIN_COMMON): %.o: .dep/%.d
 $(PLUGIN_X11) $(PLUGIN_COMMON): %.o: %.c
 	$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_X11) -DPLUGIN -DMODULE_NAME=x11 -c -o $@ $<
 
+# X11 builtin
 $(BUILTIN_X11): BUILTIN_X11_%.o: .dep/%.d
 $(BUILTIN_X11): BUILTIN_X11_%.o: %.c
 	$(CC) $(CFLAGS) $(CFLAGS_X11) -DBUILTIN -DMODULE_NAME=x11 -c -o $@ $<
 
-# XVideo
+# XVideo plugin
 $(PLUGIN_XVIDEO): %.o: .dep/%.d
 $(PLUGIN_XVIDEO): %.o: %.c
-	$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_X11) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $<
+	$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_XVIDEO) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $<
 
 $(PLUGIN_COMMON:%.o=%_xvideo.o): %_xvideo.o: .dep/%.d
 $(PLUGIN_COMMON:%.o=%_xvideo.o): %_xvideo.o: %.c
-	$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_X11) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $<
+	$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_XVIDEO) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $<
 
+# XVideo builtin
 $(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: .dep/%.d
 $(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: %.c
-	$(CC) $(CFLAGS) $(CFLAGS_X11) -DBUILTIN -DMODULE_NAME=xvideo -c -o $@ $<
+	$(CC) $(CFLAGS) $(CFLAGS_XVIDEO) -DBUILTIN -DMODULE_NAME=xvideo -c -o $@ $<
 
 #
 # Real targets