[Mesa-dev] [PATCH 2/3] make: Remove duplicate occurence of driverfuncs.c

Chad Versace chad at chad-versace.us
Mon Aug 29 11:43:11 PDT 2011


driverfuncs.o is already contained in libmesa.a, so remove it from the
following source lists:
    src/mesa/drivers/dri/Makefiles.defines:COMMON_SOURCES.
    src/mesa/drivers/dri/swrast/Makefile:SWRAST_COMMON_SOURCES

v2
----
- [idr] Also remove driverfuncs.c from swrast/Makefile.
- [idr] Fix commit message. For the autoconf build, it was incorrect to say
  that driverfuncs.o was built twice.

CC: Ian Romanick <idr at freedesktop.org>
Signed-off-by: Chad Versace <chad at chad-versace.us>
---
 src/mesa/drivers/dri/Makefile.defines |    1 -
 src/mesa/drivers/dri/swrast/Makefile  |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/Makefile.defines b/src/mesa/drivers/dri/Makefile.defines
index 19b6de8..90ae551 100644
--- a/src/mesa/drivers/dri/Makefile.defines
+++ b/src/mesa/drivers/dri/Makefile.defines
@@ -7,7 +7,6 @@ COMMON_GALLIUM_SOURCES = \
         ../common/xmlconfig.c
 
 COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
-        ../../common/driverfuncs.c \
         ../common/texmem.c \
         ../common/drirenderbuffer.c
 
diff --git a/src/mesa/drivers/dri/swrast/Makefile b/src/mesa/drivers/dri/swrast/Makefile
index 4cb99fd..509fa28 100644
--- a/src/mesa/drivers/dri/swrast/Makefile
+++ b/src/mesa/drivers/dri/swrast/Makefile
@@ -20,7 +20,6 @@ C_SOURCES = \
 ASM_SOURCES =
 
 SWRAST_COMMON_SOURCES = \
-	../../common/driverfuncs.c \
 	../common/utils.c \
 	../common/drisw_util.c
 
-- 
1.7.6



More information about the mesa-dev mailing list