* Removed unused code (intf_channels.c, keystrokes.h).

[vlc] / plugins / idct / Makefile

diff --git a/plugins/idct/Makefile b/plugins/idct/Makefile
index cf3a25d6b88f174d01a7701298e0d2f69032674e..d440e24754dc4020b5e92002d8b380fd56303265 100644 (file)
--- a/plugins/idct/Makefile
+++ b/plugins/idct/Makefile
@@ -12,27 +12,14 @@ PLUGIN_IDCTCLASSIC = idctclassic.o
 PLUGIN_IDCTMMX = idctmmx.o
 PLUGIN_IDCTMMXEXT = idctmmxext.o
 PLUGIN_IDCTALTIVEC = idctaltivec.o
-PLUGIN_IDCTCOMMON = vdec_idct.o
-PLUGIN_VDECBLOCK_C = vdec_block_c.o
-PLUGIN_VDECBLOCK_MMX = vdec_block_mmx.o
-
-BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=BUILTIN_IDCT_%.o) \
-               $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCT_%.o) \
-               $(PLUGIN_VDECBLOCK_C:%.o=BUILTIN_IDCT_%.o)
-BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=BUILTIN_IDCTCLASSIC_%.o) \
-               $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTCLASSIC_%.o) \
-               $(PLUGIN_VDECBLOCK_C:%.o=BUILTIN_IDCTCLASSIC_%.o)
-BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=BUILTIN_IDCTMMX_%.o) \
-               $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMX_%.o) \
-               $(PLUGIN_VDECBLOCK_MMX:%.o=BUILTIN_IDCTMMX_%.o)
-BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=BUILTIN_IDCTMMXEXT_%.o) \
-               $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMXEXT_%.o) \
-               $(PLUGIN_VDECBLOCK_MMX:%.o=BUILTIN_IDCTMMXEXT_%.o)
-BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=BUILTIN_IDCTALTIVEC_%.o) \
-               $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTALTIVEC_%.o) \
-               $(PLUGIN_VDECBLOCK_C:%.o=BUILTIN_IDCTALTIVEC_%.o)
-
-PLUGIN_C = $(PLUGIN_IDCT) $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C) $(PLUGIN_VDECBLOCK_MMX)
+
+BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=BUILTIN_IDCT_%.o)
+BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=BUILTIN_IDCTCLASSIC_%.o)
+BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=BUILTIN_IDCTMMX_%.o)
+BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=BUILTIN_IDCTMMXEXT_%.o)
+BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=BUILTIN_IDCTALTIVEC_%.o)
+
+PLUGIN_C = $(PLUGIN_IDCT) $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTMMXEXT)
 ALL_OBJ = $(PLUGIN_C) $(PLUGIN_IDCTALTIVEC) $(BUILTIN_IDCT) $(BUILTIN_IDCTCLASSIC) $(BUILTIN_IDCTMMX) $(BUILTIN_IDCTMMXEXT) $(BUILTIN_IDCTALTIVEC)
 
 #
@@ -43,7 +30,7 @@ include ../../Makefile.modules
 
 $(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d
 $(PLUGIN_IDCTALTIVEC): %.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) -faltivec -c -o $@ $<
+       $(CC) $(CFLAGS) $(CFLAGS_ALTIVEC) -DPLUGIN $(PCFLAGS) -c -o $@ $<
 
 $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: .dep/%.d
 $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: %.c
@@ -63,44 +50,44 @@ $(BUILTIN_IDCTMMXEXT): BUILTIN_IDCTMMXEXT_%.o: %.c
 
 $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: .dep/%.d
 $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: %.c
-       $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctaltivec -c -o $@ $<
+       $(CC) $(CFLAGS) $(CFLAGS_ALTIVEC) -DBUILTIN -DMODULE_NAME=idctaltivec -c -o $@ $<
 
 #
 # Real targets
 #
 
-../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
+../idct.so: $(PLUGIN_IDCT)
+       $(CC) -o $@ $^ $(PLCFLAGS) 
 
-../../lib/idct.a: $(BUILTIN_IDCT)
+../idct.a: $(BUILTIN_IDCT)
        ar r $@ $^
        $(RANLIB) $@
 
-../../lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
+../idctclassic.so: $(PLUGIN_IDCTCLASSIC)
+       $(CC) -o $@ $^ $(PLCFLAGS) 
 
-../../lib/idctclassic.a: $(BUILTIN_IDCTCLASSIC)
+../idctclassic.a: $(BUILTIN_IDCTCLASSIC)
        ar r $@ $^
        $(RANLIB) $@
 
-../../lib/idctmmx.so: $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
+../idctmmx.so: $(PLUGIN_IDCTMMX)
+       $(CC) -o $@ $^ $(PLCFLAGS) 
 
-../../lib/idctmmx.a: $(BUILTIN_IDCTMMX)
+../idctmmx.a: $(BUILTIN_IDCTMMX)
        ar r $@ $^
        $(RANLIB) $@
 
-../../lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
+../idctmmxext.so: $(PLUGIN_IDCTMMXEXT)
+       $(CC) -o $@ $^ $(PLCFLAGS) 
 
-../../lib/idctmmxext.a: $(BUILTIN_IDCTMMXEXT)
+../idctmmxext.a: $(BUILTIN_IDCTMMXEXT)
        ar r $@ $^
        $(RANLIB) $@
 
-../../lib/idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_IDCTALTIVEC)
+../idctaltivec.so: $(PLUGIN_IDCTALTIVEC)
+       $(CC) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS)
 
-../../lib/idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
+../idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
        ar r $@ $^
        $(RANLIB) $@