[PATCH:x11perf] Let autoconf generate x11perfcomp directly instead of doing it via sed

Gaetan Nadon memsize at videotron.ca
Wed Jul 6 18:10:24 PDT 2011


On Fri, 2011-07-01 at 19:53 -0700, Alan Coopersmith wrote:

> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
>  Makefile.am  |    6 ------
>  configure.ac |    1 +
>  2 files changed, 1 insertions(+), 6 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 5cfedb4..bb381d6 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -48,12 +48,6 @@ x11perf_SOURCES =	\
>          x11perf.h
>  
>  bin_SCRIPTS = x11perfcomp
> -CLEANFILES = $(bin_SCRIPTS)
> -EXTRA_DIST = $(bin_SCRIPTS:=.in)
> -DIR_SUBSTS = -e 's|@x11perfcompdir[@]|$(x11perfcompdir)|g'


This is actually the preferred method for variables based on prefix and
a recommendation from Automake.

        config.status: S["x11perfcompdir"]="${exec_prefix}/lib/X11/x11perfcomp"

The variable ${exec_prefix} is not defined in the script.
I have submitted a similar patches in the past and a reviewer was kind
enough to point it out. I had included $exec_prefix and $prefix but we
get into a cascading variable definitions.


> -
> -x11perfcomp: x11perfcomp.in
> -	$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/$@.in > $@
>  
>  dist_x11perfcomp_SCRIPTS = 	\
>  	fillblnk		\
> diff --git a/configure.ac b/configure.ac
> index d23c209..0e5c297 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -76,6 +76,7 @@ yes)
>  esac
>  
>  AC_CONFIG_FILES([
> +	x11perfcomp
>  	Makefile
>  	man/Makefile])
>  AC_OUTPUT




-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110706/ccc638f8/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110706/ccc638f8/attachment.pgp>


More information about the xorg-devel mailing list