Refactor COMMON_SOURCES up to Makefile.template

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index d7ecc8fcd9afb7b202448bf8bec183cdc8c248f2..81c045667d548e5871255439f93e4e1411547d35 100644 (file)
--- 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 3a03b6a9ec6f9d1e54b597e7f22da58df610f2a0..618f024cc18560001fcd450623a18f0ca8c81f3f 100644 (file)
--- 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 57592d7db9f9524f7401b50a7fc3a650e3081f6a..cb73238c030fe5c6b85a2ad931b19a37b3a7c173 100644 (file)
--- 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 64b6c13ba0dbc6860a47e2f5cb62c1b761e98e2b..250d3ac0891aa33531c48426e231dcdb3c9b30ee 100644 (file)
--- 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 70510b92cb321402cb0a708bd87fa4ed42041592..a7825b49b44a746cddf6d987b63201dc797d4ffa 100644 (file)
--- 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 411af2b3749c3aa6f1c16ef133ade235bd5c4fce..3276d396e50b50791ee8effd7ee7461aed38258b 100644 (file)
--- 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 7565a00465fe6024815d4cb806664faced9dedbd..c269fb1290d61434e364ee8ac49abfc2aafdbd44 100644 (file)
--- 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 352c7bba61c35986a9a550d5a9bcc535795b5b68..7246d51f5d784f9a0addfbec00c18b405b0e0a3c 100644 (file)
--- 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 51ece86bc2cba156e7d2b6fa4ae61b5d14e54dd4..a871064c629042ccba4ef743b38a1d52d84c7fad 100644 (file)
--- 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 5cd518e9bc4ccf2a028e20aa94d6834d9af00e69..796dfbc5167ea308e552cc8fef07c46f58413ad2 100644 (file)
--- 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 324e549922587df24c9d95c6c60d0869b74f1f56..60a048bae081d23956e3ee98c0d473dbfff5b7fb 100644 (file)
--- 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 af5f203f3cc354490d8218a165603286e97264b0..b0ef172993d6ecc51aacf1d8d945fbee0170c6d9 100644 (file)
--- 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 2c7bafaa03532de823ae8c9c6310e40f10cbaaa9..9bd797315489e3c1c0049d0d7e53643955d60971 100644 (file)
--- 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 243559f5bf2ef3ed9bb80ec8a149cdc37fd54663..018482f66beb35969a311da7829600de67296408 100644 (file)
--- 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 254800a4aad6d90f5815e3be48422889ef9dc1d3..32c64bdbf3044c19be29b08ea66febd006f454b5 100644 (file)
--- 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 5c51012d7b50bbf360264b1f4b169053ad979067..092c580feac75f2a4faf3dd2d8a37abbb2a4eddf 100644 (file)
--- 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 69d674d528b51e63782f4c43897898376519d13f..9ee24c504c11b78f88ab8ab63905855027530117 100644 (file)
--- 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 30d1200733ec5bd5cdef5b9a52c562d5a1d133f0..7875ba8f726f6608afeb7910195f24f3452af36e 100644 (file)
--- 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 \