From c3c40b77ceecd2d598dfcdc4c4793e5da3af3207 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 17 Mar 2007 01:09:37 +0000
Subject: [PATCH] Get rid of ugly conditionals.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22670 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 drivers/Makefile | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/Makefile b/drivers/Makefile
index 0a9eceb632..0e6cc5d45d 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,18 +5,14 @@ VERSION = $(shell grep UTS_RELEASE $(KERNEL_INCLUDES)/linux/version.h | cut -d '
 MDIR = /lib/modules/$(VERSION)/misc
 
 ifneq (,$(findstring 2.6, $(VERSION)))
-obj-m += mga_vid.o
+MGA_VID_OBJ = mga_vid.ko
 CFLAGS = -O2  -D__KERNEL__  -DMODULE  	 -include $(KERNEL_INCLUDES)/config/modversions.h -Wall
 else
+MGA_VID_OBJ = mga_vid.o
 CFLAGS = -O2  -D__KERNEL__  -DMODULE  	 -include $(KERNEL_INCLUDES)/linux/modversions.h -Wall
 endif
 
-ifneq (,$(findstring 2.6, $(VERSION)))
-all: mga_vid.ko mga_vid_test
-else
-all: mga_vid.o mga_vid_test
-endif
-# sis_vid.o
+all: $(MGA_VID_OBJ) mga_vid_test
 
 mga_vid.o: mga_vid.c mga_vid.h
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
@@ -33,13 +29,9 @@ tdfx_vid.o: tdfx_vid.c 3dfx.h
 tdfx_vid_tst: tdfx_vid_tst.c
 	$(CC) -O -o $@ $<
 
-install: mga_vid.o
+install: $(MGA_VID_OBJ)
 	-mkdir -p $(MDIR)
-ifneq (,$(findstring 2.6, $(VERSION)))
-	install -m 644 mga_vid.ko $(MDIR)/mga_vid.ko
-else
-	install -m 644 mga_vid.o $(MDIR)/mga_vid.o
-endif
+	install -m 644 $(MGA_VID_OBJ) $(MDIR)
 	depmod -a
 
 dep depend: