[MPlayer-cvslog] r22689 - trunk/drivers/Makefile

diego subversion at mplayerhq.hu
Sat Mar 17 14:53:16 CET 2007


Author: diego
Date: Sat Mar 17 14:53:15 2007
New Revision: 22689

Modified:
   trunk/drivers/Makefile

Log:
Remove remnants of Linux 2.6 support, the mga_vid.c part was made to
disappear in Limbo with 'cvs admin -o' ages ago.


Modified: trunk/drivers/Makefile
==============================================================================
--- trunk/drivers/Makefile	(original)
+++ trunk/drivers/Makefile	Sat Mar 17 14:53:15 2007
@@ -3,22 +3,14 @@ KERNEL_INCLUDES= $(KERNEL_DIR)/include
 VERSION = $(shell grep UTS_RELEASE $(KERNEL_INCLUDES)/linux/version.h | cut -d '"' -f2)
 MDIR = /lib/modules/$(VERSION)/misc
 
-ifneq (,$(findstring 2.6, $(VERSION)))
-MGA_VID_OBJ = mga_vid.ko
-CFLAGS = -O2 -D__KERNEL__ -DMODULE -I$(KERNEL_INCLUDES) -Wall -include $(KERNEL_INCLUDES)/config/modversions.h
-all: $(MGA_VID_OBJ) mga_vid_test
-else
 MGA_VID_OBJ = mga_vid.o
 CFLAGS = -O2 -D__KERNEL__ -DMODULE -I$(KERNEL_INCLUDES) -Wall -include $(KERNEL_INCLUDES)/linux/modversions.h
+
 all: $(MGA_VID_OBJ) mga_vid_test tdfx_vid.o tdfx_vid_test
-endif
 
 mga_vid.o: mga_vid.c mga_vid.h
 	$(CC) $(CFLAGS) -c $<
 
-mga_vid.ko: mga_vid.c mga_vid.h
-	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) modules
-
 mga_vid_test: mga_vid_test.c
 	$(CC) -O -o $@ $<
 
@@ -36,7 +28,7 @@ install: $(MGA_VID_OBJ)
 dep depend:
 
 clean:
-	rm -f *.o *~ *.ko mga_vid_test tdfx_vid_test
+	rm -f *.o *~ mga_vid_test tdfx_vid_test
 
 distclean: clean
 



More information about the MPlayer-cvslog mailing list