X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fidct%2FMakefile;h=56cd234c5051c782d2ea22ea645bead322e10d9d;hb=b3b880766e2b815d460916cb0c44e5d6f7b593c3;hp=1aa9a885ecae5b1a889c1ae8629af2460110c56a;hpb=6116299e395a1d8a27c1a7280749a0a7d59d0d66;p=vlc

diff --git a/plugins/idct/Makefile b/plugins/idct/Makefile
index 1aa9a885ec..56cd234c50 100644
--- a/plugins/idct/Makefile
+++ b/plugins/idct/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -14,31 +12,25 @@ PLUGIN_IDCTCLASSIC = idctclassic.o
 PLUGIN_IDCTMMX = idctmmx.o
 PLUGIN_IDCTMMXEXT = idctmmxext.o
 PLUGIN_IDCTALTIVEC = idctaltivec.o
-PLUGIN_IDCTCOMMON = idct_common.o
-
-BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=BUILTIN_IDCT_%.o) \
-		$(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCT_%.o)
-BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=BUILTIN_IDCTCLASSIC_%.o) \
-		$(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTCLASSIC_%.o)
-BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=BUILTIN_IDCTMMX_%.o) \
-		$(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMX_%.o)
-BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=BUILTIN_IDCTMMXEXT_%.o) \
-		$(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMXEXT_%.o)
-BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=BUILTIN_IDCTALTIVEC_%.o) \
-		$(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTALTIVEC_%.o)
-
-PLUGIN_C = $(PLUGIN_IDCT) $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON)
+
+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)
 
 #
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d
 $(PLUGIN_IDCTALTIVEC): %.o: %.c
-	$(CC) $(CFLAGS) $(PCFLAGS) -faltivec -c -o $@ $<
+	$(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -faltivec -c -o $@ $<
 
 $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: .dep/%.d
 $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: %.c
@@ -64,33 +56,38 @@ $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: %.c
 # Real targets
 #
 
-../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON)
+../idct.so: $(PLUGIN_IDCT)
 	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
 
-../../lib/idct.a: $(BUILTIN_IDCT)
+../idct.a: $(BUILTIN_IDCT)
 	ar r $@ $^
+	$(RANLIB) $@
 
-../../lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTCOMMON)
+../idctclassic.so: $(PLUGIN_IDCTCLASSIC)
 	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
 
-../../lib/idctclassic.a: $(BUILTIN_IDCTCLASSIC)
+../idctclassic.a: $(BUILTIN_IDCTCLASSIC)
 	ar r $@ $^
+	$(RANLIB) $@
 
-../../lib/idctmmx.so: $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTCOMMON)
+../idctmmx.so: $(PLUGIN_IDCTMMX)
 	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) 
 
-../../lib/idctmmx.a: $(BUILTIN_IDCTMMX)
+../idctmmx.a: $(BUILTIN_IDCTMMX)
 	ar r $@ $^
+	$(RANLIB) $@
 
-../../lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON)
+../idctmmxext.so: $(PLUGIN_IDCTMMXEXT)
 	$(CC) $(PCFLAGS) -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) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALTIVEC)
 
-../../lib/idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
+../idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
 	ar r $@ $^
+	$(RANLIB) $@