patch-2.3.32 linux/drivers/char/agp/Makefile

Next file: linux/drivers/char/agp/agp.h
Previous file: linux/drivers/char/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.31/linux/drivers/char/agp/Makefile linux/drivers/char/agp/Makefile
@@ -3,30 +3,17 @@
 # space ioctl interface to use agp memory.  It also adds a kernel interface
 # that other drivers could use to manipulate agp memory.
 
-M_OBJS		:= agpgart.o
+O_TARGET	:= agp.o
 
-CFLAGS_agp_backend.o	:=
-
-ifdef CONFIG_AGP_I810
-CFLAGS_agp_backend.o	+= -DAGP_BUILD_INTEL_I810
-endif
-ifdef CONFIG_AGP_INTEL
-CFLAGS_agp_backend.o	+= -DAGP_BUILD_INTEL_GENERIC
-endif
-ifdef CONFIG_AGP_VIA
-CFLAGS_agp_backend.o	+= -DAGP_BUILD_VIA_GENERIC
-endif
-ifdef CONFIG_AGP_AMD
-CFLAGS_agp_backend.o	+= -DAGP_BUILD_AMD_IRONGATE
-endif
-ifdef CONFIG_AGP_SIS
-CFLAGS_agp_backend.o	+= -DAGP_BUILD_SIS_GENERIC
-endif
-ifdef CONFIG_AGP_ALI
-CFLAGS_agp_backend.o	+= -DAGP_BUILD_ALI_M1541
+ifeq ($(CONFIG_AGP),y)
+  O_OBJS += agpgart.o
+else
+  ifeq ($(CONFIG_AGP), m)
+    M_OBJS += agpgart.o
+  endif
 endif
 
 include $(TOPDIR)/Rules.make
 
-agpgart.o: agp_backend.o agpgart_fe.o
-	$(LD) $(LD_RFLAG) -r -o $@ agp_backend.o agpgart_fe.o
+agpgart.o: agpgart_be.o agpgart_fe.o
+	$(LD) $(LD_RFLAG) -r -o $@ agpgart_be.o agpgart_fe.o

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)