Re: [Mesa-dev] [PATCH] mesa: Ensure that r300 compiler files only appear once in the tarballs

2011-07-26 Thread Jeremy Huddleston
That looks like it:

Reviewed-by: Jeremy Huddleston 
Tested-by: Jeremy Huddleston 

You can probably revert the --dereference one as well.

On Jul 26, 2011, at 12:09 PM, Ian Romanick wrote:

> From: Ian Romanick 
> 
> Cc: Jeremy Huddleston 
> Cc: Andreas Radke 
> ---
> Please let me know if this patch fixes the issue once and for all.
> 
> Makefile |4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index c142a93..48e779c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -285,9 +285,6 @@ MAIN_FILES = \
>   $(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms\
>   $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \
>   $(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \
> - $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]  \
> - $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile\
> - $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript  \
>   $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]  \
>   $(DIRECTORY)/src/mesa/drivers/windows/*/*.def   \
>   $(DIRECTORY)/src/mesa/drivers/x11/Makefile  \
> @@ -393,6 +390,7 @@ DRI_FILES = \
>   $(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS]   \
>   $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile\
>   $(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile  \
> + $(DIRECTORY)/src/mesa/drivers/dri/*/*/SConscript\
>   $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile
> 
> SGI_GLU_FILES = \
> -- 
> 1.7.4.4
> 

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] mesa: Ensure that r300 compiler files only appear once in the tarballs

2011-07-26 Thread Ian Romanick
From: Ian Romanick 

Cc: Jeremy Huddleston 
Cc: Andreas Radke 
---
Please let me know if this patch fixes the issue once and for all.

 Makefile |4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c142a93..48e779c 100644
--- a/Makefile
+++ b/Makefile
@@ -285,9 +285,6 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms\
$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \
$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \
-   $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]  \
-   $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile\
-   $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript  \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]  \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.def   \
$(DIRECTORY)/src/mesa/drivers/x11/Makefile  \
@@ -393,6 +390,7 @@ DRI_FILES = \
$(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS]   \
$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile\
$(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile  \
+   $(DIRECTORY)/src/mesa/drivers/dri/*/*/SConscript\
$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile
 
 SGI_GLU_FILES = \
-- 
1.7.4.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev