-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/27/2011 12:16 AM, Ian Romanick wrote: > On 08/26/2011 06:53 PM, Chad Versace wrote: >> Stop building driverfuncs.c twice for each DRI driver. driverfuncs.c is >> included in both libmesa.a and in >> src/mesa/drivers/dri/Makefiles.defines:COMMON_SOURCES, so remove it from >> COMMON_SOURCES. > > It only actually gets built once, but the linker has to wrestle with it > twice.
Right. How about this? 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 >> Signed-off-by: Chad Versace <c...@chad-versace.us> >> --- >> src/mesa/drivers/dri/Makefile.defines | 1 - >> 1 files changed, 0 insertions(+), 1 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 > > It also appears in a some of dri/*/Makefile. Those should probably get > cleaned up too. It looks like the COMMON_SOURCES lines in r300/Makefile > and r600/Makefile can just be deleted. swrast/Makefile could get some > cleaning too. It looks like there are enough changes made to the series to warrant a reposting. I'll cleanup r300 and r600 in v2. - -- Chad Versace c...@chad-versace.us -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJOWmJ5AAoJEAIvNt057x8iSucP/2nWMW+xpZgbOwzyYjGmFCXq CmMGw3AKbBD+mMPfxCujr9pjWJ2Lsf0108knNN3U/PjU9oez0Pox1DjQDct1/oBh rl1ooeJ2uEMhqcekpyMJQGLYt53V6R3j6s1b4bK9jynifJPI4hlmJXBxHckOUfUS Tp9CwkhAl1EWjubxmckOZ9ulHyq3zutIe4b4NYjH4xuRApHcFhOOyjZInBlmF8Y5 JswakdteoDiaVdonPnviKhKQLmzP2XVyX+W5wOw9W3wVRIjYYHnqzua/B6E/YuYD RHlS12F3Fu+mgdFdsV8ULDzjXdWUyu/QgJX/waAXLCm7XNKuP0vM87AQ9owTqY+I mOm4hy0xRDh67rG7ZKGEGCbXFiEf0T4dBDKdAb/Aq53axv6PQce2RrNcHFaFNSWq 6vq6ZfUSjbWVV9aoPpPMbhD5x56AL+FAaYATnuSmnIIOE3O3ZRv03pHYCqnv//8l IkWdYugysBzbkAMzVrGLVfUWpcWsplvu8GBCc+1M+b6JYx7auB9X2FUS5wWK+EE+ 91ls/vRS4sOR9k1LN4rbJ2OQjRDRYILs5xUxVsVDVtUAH/OE6/uq9k5VoUfH18eN NtEVibaU1PxqyVKTdKod20A/aYvvtOnVYnuObS3e4oj9Pm51HkYKSZBF1BndBnhY Xa5MHpjoGF4M80ytnTmH =IaPi -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev