* COMPLETE CVS BREAKAGE !! The MAIN branch is going to be a playground

[vlc] / plugins / x11 / Makefile

diff --git a/plugins/x11/Makefile b/plugins/x11/Makefile
index b60a6a23506d176ac160bebc4e5cdcc10e5b2301..4ef99b50d320ae84c3f3ea9239b3b9c8dedc5b55 100644 (file)
--- a/plugins/x11/Makefile
+++ b/plugins/x11/Makefile
@@ -9,19 +9,15 @@
 
 PLUGIN_X11 = x11.o vout_x11.o
 PLUGIN_XVIDEO = xvideo.o vout_xvideo.o
-BUILTIN_X11 = $(PLUGIN_X11:%.o=BUILTIN_%.o)
-BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.o=BUILTIN_%.o)
+PLUGIN_XCOMMON = vout_common.o
 
-PLUGIN_C = $(PLUGIN_X11) $(PLUGIN_XVIDEO)
-BUILTIN_C = $(BUILTIN_X11) $(BUILTIN_XVIDEO)
+BUILTIN_X11 = $(PLUGIN_X11:%.o=BUILTIN_X11_%.o) \
+              $(PLUGIN_XCOMMON:%.o=BUILTIN_X11_%.o)
+BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.o=BUILTIN_XVIDEO_%.o) \
+                 $(PLUGIN_XCOMMON:%.o=BUILTIN_XVIDEO_%.o)
 
-ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
-
-#
-# Special plugin modifications
-#
-
-CFLAGS += $(CFLAGS_X11)
+PLUGIN_C = $(PLUGIN_X11) $(PLUGIN_XVIDEO) $(PLUGIN_XCOMMON)
+ALL_OBJ = $(PLUGIN_C) $(BUILTIN_X11) $(BUILTIN_XVIDEO)
 
 #
 # Virtual targets
@@ -29,27 +25,27 @@ CFLAGS += $(CFLAGS_X11)
 
 include ../../Makefile.modules
 
+$(BUILTIN_X11): BUILTIN_X11_%.o: .dep/%.d
+$(BUILTIN_X11): BUILTIN_X11_%.o: %.c
+       $(CC) $(CFLAGS) $(CFLAGS_X11) -DBUILTIN -DMODULE_NAME=x11 -c -o $@ $<
+
+$(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: .dep/%.d
+$(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: %.c
+       $(CC) $(CFLAGS) $(CFLAGS_XVIDEO) -DBUILTIN -DMODULE_NAME=xvideo -c -o $@ $<
+
 #
 # Real targets
 #
 
 ../x11.so: $(PLUGIN_X11)
-ifeq ($(SYS),nto-qnx)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11) -lsocket
-else
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11)
-endif
 
 ../x11.a: $(BUILTIN_X11)
        ar r $@ $^
        $(RANLIB) $@
 
 ../xvideo.so: $(PLUGIN_XVIDEO)
-ifeq ($(SYS),nto-qnx)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO) -lsocket
-else
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO)
-endif
 
 ../xvideo.a: $(BUILTIN_XVIDEO)
        ar r $@ $^