* Added .cvsignore files in the plugins directories.

[vlc] / plugins / mpeg / Makefile

diff --git a/plugins/mpeg/Makefile b/plugins/mpeg/Makefile
index fa9cb083c350fd740bfa277c036fd1f3fa068162..67df6bd33be1b2390fff8115eb837a4ab806f817 100644 (file)
--- a/plugins/mpeg/Makefile
+++ b/plugins/mpeg/Makefile
@@ -3,53 +3,31 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
-include ../../Makefile.modules
+-include ../../Makefile.modules
+
+#
+# Objects
+#
 
-###############################################################################
-# Objects and files
-###############################################################################
 PLUGIN_PS = ps.o input_ps.o
 PLUGIN_TS = ts.o input_ts.o
-BUILTIN_PS = $(PLUGIN_PS:%.o=%-BUILTIN.o)
-BUILTIN_TS = $(PLUGIN_TS:%.o=%-BUILTIN.o)
-
-STD_PLUGIN_OBJ = $(PLUGIN_PS) $(PLUGIN_TS)
-STD_BUILTIN_OBJ = $(BUILTIN_PS) $(BUILTIN_TS)
-ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
-
-objects := $(ALL_OBJ)
-cdependancies := $(objects:%.o=.dep/%.d)
+BUILTIN_PS = $(PLUGIN_PS:%.o=BUILTIN_%.o)
+BUILTIN_TS = $(PLUGIN_TS:%.o=BUILTIN_%.o)
 
-export
+PLUGIN_C = $(PLUGIN_PS) $(PLUGIN_TS)
+BUILTIN_C = $(BUILTIN_PS) $(BUILTIN_TS)
+ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 
 #
 # Virtual targets
 #
-all:
 
-clean:
-       rm -f $(ALL_OBJ)
-       rm -f *.o *.moc *.bak *.builtin
-       rm -rf .dep
-
-FORCE:
-
-$(cdependancies): %.d: FORCE
-       @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
-
-$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
-
-$(STD_PLUGIN_OBJ): %.o: .dep/%.d
-$(STD_PLUGIN_OBJ): %.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
-
-$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
-$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
-       $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
+include ../../Makefile.common
 
 #
 # Real targets
 #
+
 ../../lib/ps.so: $(PLUGIN_PS)
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)