From e7769cb34898ca20adb5b0e329161e6321403fc9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 May 2005 03:15:08 +0000 Subject: Refactor COMMON_SOURCES up to Makefile.template --- src/mesa/drivers/dri/Makefile.template | 10 ++++++++++ src/mesa/drivers/dri/fb/Makefile | 11 ----------- src/mesa/drivers/dri/ffb/Makefile | 11 ----------- src/mesa/drivers/dri/gamma/Makefile | 10 ---------- src/mesa/drivers/dri/i810/Makefile | 11 ----------- src/mesa/drivers/dri/i830/Makefile | 12 ------------ src/mesa/drivers/dri/i915/Makefile | 12 ------------ src/mesa/drivers/dri/mach64/Makefile | 11 ----------- src/mesa/drivers/dri/mga/Makefile | 11 ----------- src/mesa/drivers/dri/r128/Makefile | 11 ----------- src/mesa/drivers/dri/r200/Makefile | 12 ------------ src/mesa/drivers/dri/radeon/Makefile | 11 ----------- src/mesa/drivers/dri/s3v/Makefile | 11 ----------- src/mesa/drivers/dri/savage/Makefile | 11 ----------- src/mesa/drivers/dri/sis/Makefile | 11 ----------- src/mesa/drivers/dri/tdfx/Makefile | 10 ---------- src/mesa/drivers/dri/trident/Makefile | 11 ----------- src/mesa/drivers/dri/unichrome/Makefile | 11 ----------- 18 files changed, 10 insertions(+), 188 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index d7ecc8fcd9..81c045667d 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -2,6 +2,16 @@ MESA_MODULES = $(TOP)/src/mesa/mesa.a +COMMON_SOURCES = \ + ../../common/driverfuncs.c \ + ../common/mm.c \ + ../common/utils.c \ + ../common/texmem.c \ + ../common/vblank.c \ + ../common/dri_util.c \ + ../common/xmlconfig.c \ + ../common/drirenderbuffer.c \ + ../common/glcontextmodes.c ifeq ($(WINDOW_SYSTEM),dri) WINOBJ=../dri_client/dri.a diff --git a/src/mesa/drivers/dri/fb/Makefile b/src/mesa/drivers/dri/fb/Makefile index 3a03b6a9ec..618f024cc1 100644 --- a/src/mesa/drivers/dri/fb/Makefile +++ b/src/mesa/drivers/dri/fb/Makefile @@ -5,17 +5,6 @@ include $(TOP)/configs/current LIBNAME = fb_dri.so -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/dri_util.c \ - ../common/xmlconfig.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ fb_dri.c diff --git a/src/mesa/drivers/dri/ffb/Makefile b/src/mesa/drivers/dri/ffb/Makefile index 57592d7db9..cb73238c03 100644 --- a/src/mesa/drivers/dri/ffb/Makefile +++ b/src/mesa/drivers/dri/ffb/Makefile @@ -8,17 +8,6 @@ LIBNAME = ffb_dri.so # not yet # MINIGLX_SOURCES = server/ffb_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ ffb_bitmap.c \ ffb_clear.c \ diff --git a/src/mesa/drivers/dri/gamma/Makefile b/src/mesa/drivers/dri/gamma/Makefile index 64b6c13ba0..250d3ac089 100644 --- a/src/mesa/drivers/dri/gamma/Makefile +++ b/src/mesa/drivers/dri/gamma/Makefile @@ -8,16 +8,6 @@ LIBNAME = gamma_dri.so # Not yet # MINIGLX_SOURCES = server/gamma_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ gamma_context.c \ gamma_dd.c \ diff --git a/src/mesa/drivers/dri/i810/Makefile b/src/mesa/drivers/dri/i810/Makefile index 70510b92cb..a7825b49b4 100644 --- a/src/mesa/drivers/dri/i810/Makefile +++ b/src/mesa/drivers/dri/i810/Makefile @@ -8,17 +8,6 @@ LIBNAME = i810_dri.so # Not yet # MINIGLX_SOURCES = server/i810_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/dri_util.c \ - ../common/glcontextmodes.c \ - ../common/drirenderbuffer.c \ - ../common/xmlconfig.c - DRIVER_SOURCES = \ i810context.c \ i810ioctl.c \ diff --git a/src/mesa/drivers/dri/i830/Makefile b/src/mesa/drivers/dri/i830/Makefile index 411af2b374..3276d396e5 100644 --- a/src/mesa/drivers/dri/i830/Makefile +++ b/src/mesa/drivers/dri/i830/Makefile @@ -4,18 +4,6 @@ include $(TOP)/configs/current LIBNAME = i830_dri.so - -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ i830_context.c \ i830_debug.c \ diff --git a/src/mesa/drivers/dri/i915/Makefile b/src/mesa/drivers/dri/i915/Makefile index 7565a00465..c269fb1290 100644 --- a/src/mesa/drivers/dri/i915/Makefile +++ b/src/mesa/drivers/dri/i915/Makefile @@ -4,18 +4,6 @@ include $(TOP)/configs/current LIBNAME = i915_dri.so - -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ i915_context.c \ i915_debug.c \ diff --git a/src/mesa/drivers/dri/mach64/Makefile b/src/mesa/drivers/dri/mach64/Makefile index 352c7bba61..7246d51f5d 100644 --- a/src/mesa/drivers/dri/mach64/Makefile +++ b/src/mesa/drivers/dri/mach64/Makefile @@ -8,17 +8,6 @@ LIBNAME = mach64_dri.so # Not yet # MINIGLX_SOURCES = server/mach64_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ mach64_context.c \ mach64_ioctl.c \ diff --git a/src/mesa/drivers/dri/mga/Makefile b/src/mesa/drivers/dri/mga/Makefile index 51ece86bc2..a871064c62 100644 --- a/src/mesa/drivers/dri/mga/Makefile +++ b/src/mesa/drivers/dri/mga/Makefile @@ -7,17 +7,6 @@ LIBNAME = mga_dri.so MINIGLX_SOURCES = server/mga_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ mgadd.c \ mgaioctl.c \ diff --git a/src/mesa/drivers/dri/r128/Makefile b/src/mesa/drivers/dri/r128/Makefile index 5cd518e9bc..796dfbc516 100644 --- a/src/mesa/drivers/dri/r128/Makefile +++ b/src/mesa/drivers/dri/r128/Makefile @@ -7,17 +7,6 @@ LIBNAME = r128_dri.so MINIGLX_SOURCES = server/r128_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ r128_context.c \ r128_lock.c \ diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index 324e549922..60a048bae0 100644 --- a/src/mesa/drivers/dri/r200/Makefile +++ b/src/mesa/drivers/dri/r200/Makefile @@ -7,18 +7,6 @@ LIBNAME = r200_dri.so MINIGLX_SOURCES = server/radeon_dri.c - -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = r200_context.c \ r200_ioctl.c \ r200_lock.c \ diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile index af5f203f3c..b0ef172993 100644 --- a/src/mesa/drivers/dri/radeon/Makefile +++ b/src/mesa/drivers/dri/radeon/Makefile @@ -8,17 +8,6 @@ LIBNAME = radeon_dri.so MINIGLX_SOURCES = server/radeon_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ radeon_context.c \ radeon_ioctl.c \ diff --git a/src/mesa/drivers/dri/s3v/Makefile b/src/mesa/drivers/dri/s3v/Makefile index 2c7bafaa03..9bd7973154 100644 --- a/src/mesa/drivers/dri/s3v/Makefile +++ b/src/mesa/drivers/dri/s3v/Makefile @@ -8,17 +8,6 @@ LIBNAME = s3v_dri.so # Doesn't exist yet. #MINIGLX_SOURCES = server/savage_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ s3v_context.c \ s3v_dd.c \ diff --git a/src/mesa/drivers/dri/savage/Makefile b/src/mesa/drivers/dri/savage/Makefile index 243559f5bf..018482f66b 100644 --- a/src/mesa/drivers/dri/savage/Makefile +++ b/src/mesa/drivers/dri/savage/Makefile @@ -8,17 +8,6 @@ LIBNAME = savage_dri.so # Doesn't exist yet. #MINIGLX_SOURCES = server/savage_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ savage_xmesa.c \ savagedd.c \ diff --git a/src/mesa/drivers/dri/sis/Makefile b/src/mesa/drivers/dri/sis/Makefile index 254800a4aa..32c64bdbf3 100644 --- a/src/mesa/drivers/dri/sis/Makefile +++ b/src/mesa/drivers/dri/sis/Makefile @@ -9,17 +9,6 @@ LIBNAME = sis_dri.so # Not yet # MINIGLX_SOURCES = server/sis_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ sis_alloc.c \ sis_clear.c \ diff --git a/src/mesa/drivers/dri/tdfx/Makefile b/src/mesa/drivers/dri/tdfx/Makefile index 5c51012d7b..092c580fea 100644 --- a/src/mesa/drivers/dri/tdfx/Makefile +++ b/src/mesa/drivers/dri/tdfx/Makefile @@ -8,16 +8,6 @@ LIBNAME = tdfx_dri.so # not yet # MINIGLX_SOURCES = server/tdfx_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ tdfx_context.c \ tdfx_dd.c \ diff --git a/src/mesa/drivers/dri/trident/Makefile b/src/mesa/drivers/dri/trident/Makefile index 69d674d528..9ee24c504c 100644 --- a/src/mesa/drivers/dri/trident/Makefile +++ b/src/mesa/drivers/dri/trident/Makefile @@ -8,17 +8,6 @@ LIBNAME = trident_dri.so # Not yet # MINIGLX_SOURCES = server/trident_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ trident_context.c \ trident_state.c \ diff --git a/src/mesa/drivers/dri/unichrome/Makefile b/src/mesa/drivers/dri/unichrome/Makefile index 30d1200733..7875ba8f72 100644 --- a/src/mesa/drivers/dri/unichrome/Makefile +++ b/src/mesa/drivers/dri/unichrome/Makefile @@ -7,17 +7,6 @@ LIBNAME = unichrome_dri.so MINIGLX_SOURCES = server/via_dri.c -COMMON_SOURCES = \ - ../../common/driverfuncs.c \ - ../common/mm.c \ - ../common/utils.c \ - ../common/texmem.c \ - ../common/vblank.c \ - ../common/xmlconfig.c \ - ../common/dri_util.c \ - ../common/drirenderbuffer.c \ - ../common/glcontextmodes.c - DRIVER_SOURCES = \ via_context.c \ via_fb.c \ -- cgit v1.2.3