* Mandatory step for video output IV and the audio output quality

[vlc] / plugins / motion / Makefile

diff --git a/plugins/motion/Makefile b/plugins/motion/Makefile
index dce17226106e02413a0de1126270cebe9364a7a1..fb5f26d569c23b0f17cacacf35e3b4358ef1f419 100644 (file)
--- a/plugins/motion/Makefile
+++ b/plugins/motion/Makefile
@@ -3,94 +3,72 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
-include ../../Makefile.modules
+#
+# Objects
+#
 
-###############################################################################
-# Objects and files
-###############################################################################
 PLUGIN_MOTION = motion.o vdec_motion_inner.o
 PLUGIN_MOTIONMMX = motionmmx.o vdec_motion_inner_mmx.o
 PLUGIN_MOTIONMMXEXT = motionmmxext.o vdec_motion_inner_mmxext.o
 PLUGIN_MOTIONCOMMON = vdec_motion_common.o
 
-BUILTIN_MOTION = $(PLUGIN_MOTION:%.o=%-BUILTIN-MOTION.o) \
-               $(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTION.o)
-BUILTIN_MOTIONMMX = $(PLUGIN_MOTIONMMX:%.o=%-BUILTIN-MOTIONMMX.o) \
-               $(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTIONMMX.o)
-BUILTIN_MOTIONMMXEXT = $(PLUGIN_MOTIONMMXEXT:%.o=%-BUILTIN-MOTIONMMXEXT.o) \
-               $(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTIONMMXEXT.o)
-
-STD_PLUGIN_OBJ = $(PLUGIN_MOTION) $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
-ALL_OBJ = $(STD_PLUGIN_OBJ) $(BUILTIN_MOTION) $(BUILTIN_MOTIONMMX) $(BUILTIN_MOTIONMMXEXT)
+BUILTIN_MOTION = $(PLUGIN_MOTION:%.o=BUILTIN_MOTION_%.o) \
+               $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTION_%.o)
+BUILTIN_MOTIONMMX = $(PLUGIN_MOTIONMMX:%.o=BUILTIN_MOTIONMMX_%.o) \
+               $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTIONMMX_%.o)
+BUILTIN_MOTIONMMXEXT = $(PLUGIN_MOTIONMMXEXT:%.o=BUILTIN_MOTIONMMXEXT_%.o) \
+               $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTIONMMXEXT_%.o)
 
-objects := $(ALL_OBJ)
-cdependancies := $(objects:%.o=.dep/%.d)
-
-export
+PLUGIN_C = $(PLUGIN_MOTION) $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
+ALL_OBJ = $(PLUGIN_C) $(BUILTIN_MOTION) $(BUILTIN_MOTIONMMX) $(BUILTIN_MOTIONMMXEXT)
 
 #
 # Virtual targets
 #
-all:
-
-clean:
-       rm -f $(ALL_OBJ)
-       rm -f *.o *.moc *.bak *.so *.a *.builtin
-       rm -rf .dep
 
-FORCE:
-
-$(cdependancies): %.d: FORCE
-       @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
-
-$(ALL_OBJ): %.o: ../../Makefile.dep
-
-$(STD_PLUGIN_OBJ): %.o: .dep/%.d
-$(STD_PLUGIN_OBJ): %.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
+include ../../Makefile.modules
 
-$(BUILTIN_MOTION): %-BUILTIN-MOTION.o: .dep/%.d
-$(BUILTIN_MOTION): %-BUILTIN-MOTION.o: %.c
+$(BUILTIN_MOTION): BUILTIN_MOTION_%.o: .dep/%.d
+$(BUILTIN_MOTION): BUILTIN_MOTION_%.o: %.c
        $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motion -c -o $@ $<
 
-$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: .dep/%.d
-$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: %.c
+$(BUILTIN_MOTIONMMX): BUILTIN_MOTIONMMX_%.o: .dep/%.d
+$(BUILTIN_MOTIONMMX): BUILTIN_MOTIONMMX_%.o: %.c
        $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmx -c -o $@ $<
 
-$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: .dep/%.d
-$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: %.c
+$(BUILTIN_MOTIONMMXEXT): BUILTIN_MOTIONMMXEXT_%.o: .dep/%.d
+$(BUILTIN_MOTIONMMXEXT): BUILTIN_MOTIONMMXEXT_%.o: %.c
        $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmxext -c -o $@ $<
 
 #
 # Real targets
 #
+
 ../../lib/motion.so: $(PLUGIN_MOTION) $(PLUGIN_MOTIONCOMMON)
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
 
 ../../lib/motion.a: $(BUILTIN_MOTION)
        ar r $@ $^
+       $(RANLIB) $@
 
 ../../lib/motionclassic.so: $(PLUGIN_MOTIONCLASSIC) $(PLUGIN_MOTIONCOMMON)
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
 
 ../../lib/motionclassic.a: $(BUILTIN_MOTIONCLASSIC)
        ar r $@ $^
+       $(RANLIB) $@
 
 ../../lib/motionmmx.so: $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONCOMMON)
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
 
 ../../lib/motionmmx.a: $(BUILTIN_MOTIONMMX)
        ar r $@ $^
+       $(RANLIB) $@
 
 ../../lib/motionmmxext.so: $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
 
 ../../lib/motionmmxext.a: $(BUILTIN_MOTIONMMXEXT)
        ar r $@ $^
-
-../../lib/motionaltivec.so: $(PLUGIN_MOTIONALTIVEC) $(PLUGIN_MOTIONCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework vecLib
-
-../../lib/motionaltivec.a: $(BUILTIN_MOTIONALTIVEC)
-       ar r $@ $^
+       $(RANLIB) $@