# HG changeset patch
# User diego
# Date 1156344329 0
# Node ID 2a00413b228e98665ca08c5d0729f3d398a83e64
# Parent  faf94e4b3a36ff6a1b3aa1278f4f6c0bea4a6dae
Redundancy removal part I: Unify CFLAGS and LDFLAGS handling.

diff -r faf94e4b3a36 -r 2a00413b228e vidix/drivers/Makefile
--- a/vidix/drivers/Makefile	Wed Aug 23 14:34:42 2006 +0000
+++ b/vidix/drivers/Makefile	Wed Aug 23 14:45:29 2006 +0000
@@ -4,71 +4,62 @@
 
 BINDIR = $(LIBDIR)/mplayer/vidix
 
+VIDIX_LIBS = -L../../libdha -ldha
+VIDIX_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
+
 CYBERBLADE_VID=cyberblade_vid.so
 CYBERBLADE_SRCS=cyberblade_vid.c
 CYBERBLADE_OBJS=cyberblade_vid.o
-CYBERBLADE_LIBS=-L../../libdha -ldha -lm
-CYBERBLADE_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
+CYBERBLADE_LIBS=$(VIDIX_LIBS) -lm
 
 RADEON_VID=radeon_vid.so
 RADEON_SRCS=radeon_vid.c
 RADEON_OBJS=radeon_vid.o
-RADEON_LIBS=-L../../libdha -ldha -lm $(X_LIB)
-RADEON_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
+RADEON_LIBS=$(VIDIX_LIBS) -lm $(X_LIB)
 
 RAGE128_VID=rage128_vid.so
 RAGE128_SRCS=radeon_vid.c
 RAGE128_OBJS=rage128_vid.o
-RAGE128_LIBS=-L../../libdha -ldha -lm $(X_LIB)
-RAGE128_CFLAGS=-fPIC -I. -I.. -DRAGE128 $(OPTFLAGS)
+RAGE128_LIBS=$(VIDIX_LIBS) -lm $(X_LIB)
+RAGE128_CFLAGS=$(VIDIX_CFLAGS) -DRAGE128
 
 PM3_VID=pm3_vid.so
 PM3_SRCS=pm3_vid.c
 PM3_OBJS=pm3_vid.o
-PM3_LIBS=-L../../libdha -ldha
-PM3_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
 
 MACH64_VID=mach64_vid.so
 MACH64_SRCS=mach64_vid.c
 MACH64_OBJS=mach64_vid.o
-MACH64_LIBS=-L../../libdha -ldha
-MACH64_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
 
 MGA_VID=mga_vid.so
 MGA_SRCS=mga_vid.c
 MGA_OBJS=mga_vid.o
-MGA_LIBS=-L../../libdha -ldha -lm
-MGA_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
+MGA_LIBS=$(VIDIX_LIBS) -lm
 
 MGA_CRTC2_VID=mga_crtc2_vid.so
 MGA_CRTC2_SRCS=mga_vid.c
 MGA_CRTC2_OBJS=mga_crtc2_vid.o
-MGA_CRTC2_LIBS=-L../../libdha -ldha -lm
-MGA_CRTC2_CFLAGS=-fPIC -I. -I.. -DCRTC2 $(OPTFLAGS)
+MGA_CRTC2_LIBS=$(VIDIX_LIBS) -lm
+MGA_CRTC2_CFLAGS=$(VIDIX_CFLAGS) -DCRTC2
 
 NVIDIA_VID=nvidia_vid.so
 NVIDIA_SRCS=nvidia_vid.c
 NVIDIA_OBJS=nvidia_vid.o
-NVIDIA_LIBS=-L../../libdha -ldha -lm
-NVIDIA_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
+NVIDIA_LIBS=$(VIDIX_LIBS) -lm
 
 SIS_VID=sis_vid.so
 SIS_SRCS=sis_vid.c sis_bridge.c
 SIS_OBJS=sis_vid.o sis_bridge.o
-SIS_LIBS=-L../../libdha -ldha
-SIS_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
 
 UNICHROME_VID=unichrome_vid.so
 UNICHROME_SRCS=unichrome_vid.c
 UNICHROME_OBJS=unichrome_vid.o
-UNICHROME_LIBS=-L../../libdha -ldha -lm
-UNICHROME_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
+UNICHROME_LIBS=$(VIDIX_LIBS) -lm
 
 SAVAGE_VID=savage_vid.so
 SAVAGE_SRCS=savage_vid.c
 SAVAGE_OBJS=savage_vid.o
-SAVAGE_LIBS=-L../../libdha -ldha -lm
-SAVAGE_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS)
+SAVAGE_LIBS=$(VIDIX_LIBS) -lm
 
 all:    $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID) $(UNICHROME_VID) $(SAVAGE_VID)
 
@@ -78,19 +69,19 @@
 # .PHONY: all clean
 
 $(CYBERBLADE_OBJS):    $(CYBERBLADE_SRCS)
-	$(CC) -c $(CYBERBLADE_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(CYBERBLADE_VID):     $(CYBERBLADE_OBJS)
 	$(CC) -shared $< $(CYBERBLADE_LIBS) -Wl,-soname,$@ -o $@
 
 $(PM3_OBJS):    $(PM3_SRCS)
-	$(CC) -c $(PM3_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(PM3_VID):     $(PM3_OBJS)
-	$(CC) -shared $< $(PM3_LIBS) -Wl,-soname,$@ -o $@
+	$(CC) -shared $< $(VIDIX_LIBS) -Wl,-soname,$@ -o $@
 
 $(RADEON_OBJS):    $(RADEON_SRCS)
-	$(CC) -c $(RADEON_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(RADEON_VID):     $(RADEON_OBJS)
 	$(CC) -shared $< $(RADEON_LIBS) -Wl,-soname,$@ -o $@
@@ -102,19 +93,19 @@
 	$(CC) -shared $< $(RAGE128_LIBS) -Wl,-soname,$@ -o $@
 
 $(MACH64_OBJS):    $(MACH64_SRCS)
-	$(CC) -c $(MACH64_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(MACH64_VID):     $(MACH64_OBJS)
-	$(CC) -shared $< $(MACH64_LIBS) -Wl,-soname,$@ -o $@
+	$(CC) -shared $< $(VIDIX_LIBS) -Wl,-soname,$@ -o $@
 
 $(NVIDIA_OBJS):    $(NVIDIA_SRCS)
-	$(CC) -c $(NVIDIA_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(NVIDIA_VID):     $(NVIDIA_OBJS)
 	$(CC) -shared $< $(NVIDIA_LIBS) -Wl,-soname,$@ -o $@
 
 $(MGA_OBJS):    $(MGA_SRCS)
-	$(CC) -c $(MGA_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(MGA_VID):     $(MGA_OBJS)
 	$(CC) -shared $< $(MGA_LIBS) -Wl,-soname,$@ -o $@
@@ -126,19 +117,19 @@
 	$(CC) -shared $< $(MGA_CRTC2_LIBS) -Wl,-soname,$@ -o $@
 
 $(SIS_OBJS):    $(SIS_SRCS)
-	$(CC) -c $(SIS_CFLAGS) -o $@ $(basename $@).c
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $(basename $@).c
 
 $(SIS_VID):     $(SIS_OBJS)
-	$(CC) -shared $< $(SIS_LIBS) -Wl,-soname,$@ -o $@
+	$(CC) -shared $< $(VIDIX_LIBS) -Wl,-soname,$@ -o $@
 
 $(UNICHROME_OBJS):    $(UNICHROME_SRCS)
-	$(CC) -c $(UNICHROME_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(UNICHROME_VID):     $(UNICHROME_OBJS)
 	$(CC) -shared $< $(UNICHROME_LIBS) -Wl,-soname,$@ -o $@
 
 $(SAVAGE_OBJS):    $(SAVAGE_SRCS)
-	$(CC) -c $(SAVAGE_CFLAGS) -o $@ $<
+	$(CC) -c $(VIDIX_CFLAGS) -o $@ $<
 
 $(SAVAGE_VID):     $(SAVAGE_OBJS)
 	$(CC) -shared $< $(SAVAGE_LIBS) -Wl,-soname,$@ -o $@