[MPlayer-cvslog] r25589 - in trunk/vidix: Makefile mga_crtc2_vid.c rage128_vid.c

[diego]

Author: diego
Date: Wed Jan  2 23:00:34 2008
New Revision: 25589

Log:
Get rid of build system hackery to generate mga_crtc2_vid.o and rage128_vid.o.
Instead, create files that #include mga_vid.c/radeon_vid.c with the proper
#defines set.  This has the added benefit of fixing dependency generation,
which only works for existing .c files.


Added:
   trunk/vidix/mga_crtc2_vid.c
   trunk/vidix/rage128_vid.c
Modified:
   trunk/vidix/Makefile

Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile	(original)
+++ trunk/vidix/Makefile	Wed Jan  2 23:00:34 2008
@@ -14,21 +14,16 @@ SRCS_MPLAYER-$(VIDIX_CYBERBLADE)        
 SRCS_MPLAYER-$(VIDIX_IVTV)                 += ivtv_vid.c
 SRCS_MPLAYER-$(VIDIX_MACH64)               += mach64_vid.c
 SRCS_MPLAYER-$(VIDIX_MGA)                  += mga_vid.c
+SRCS_MPLAYER-$(VIDIX_MGA_CRTC2)            += mga_crtc2_vid.c
 SRCS_MPLAYER-$(VIDIX_NVIDIA)               += nvidia_vid.c
 SRCS_MPLAYER-$(VIDIX_PM2)                  += pm2_vid.c
 SRCS_MPLAYER-$(VIDIX_PM3)                  += pm3_vid.c
 SRCS_MPLAYER-$(VIDIX_RADEON)               += radeon_vid.c
+SRCS_MPLAYER-$(VIDIX_RAGE128)              += rage128_vid.c
 SRCS_MPLAYER-$(VIDIX_SAVAGE)               += savage_vid.c
 SRCS_MPLAYER-$(VIDIX_SIS)                  += sis_vid.c sis_bridge.c
 SRCS_MPLAYER-$(VIDIX_UNICHROME)            += unichrome_vid.c
 
-ifeq ($(VIDIX_MGA_CRTC2), yes)
-OBJS_MPLAYER += mga_crtc2_vid.o
-endif
-ifeq ($(VIDIX_RAGE128),yes)
-OBJS_MPLAYER += rage128_vid.o
-endif
-
 # If you want libdha to use svgalib_helper for hardware access,
 # uncomment this statement, and change the -I to the correct directory
 # that includes svgalib_helper.o:
@@ -44,12 +39,6 @@ include ../mpcommon.mak
 
 $(OBJS_MPLAYER): $(PCI_FILES)
 
-mga_crtc2_vid.o: mga_vid.c
-	$(CC) -c $(CFLAGS) -DCRTC2 -o $@ $<
-
-rage128_vid.o: radeon_vid.c
-	$(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
-
 $(PCI_FILES): pci.db
 	LC_ALL=C awk -f pci_db2c.awk $< $(VIDIX_PCIDB)
 

Added: trunk/vidix/mga_crtc2_vid.c
==============================================================================
--- (empty file)
+++ trunk/vidix/mga_crtc2_vid.c	Wed Jan  2 23:00:34 2008
@@ -0,0 +1,3 @@
+#define CRTC2
+
+#include "mga_vid.c"

Added: trunk/vidix/rage128_vid.c
==============================================================================
--- (empty file)
+++ trunk/vidix/rage128_vid.c	Wed Jan  2 23:00:34 2008
@@ -0,0 +1,3 @@
+#define RAGE128
+
+#include "radeon_vid.c"