[PATCH xorg-gtest 2/3] distcheck fails: cannot open linker script file libxorg-gtest.ver

Chase Douglas chase.douglas at canonical.com
Wed Feb 29 12:29:51 PST 2012


On 02/27/2012 08:04 AM, Gaetan Nadon wrote:
> The $(top_srcdir) path is needed to locate the source as it is not
> in the same dir as the generated files.
>
> Signed-off-by: Gaetan Nadon<memsize at videotron.ca>
> ---
>   src/Makefile.am |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 2c2648a..c760354 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -28,10 +28,10 @@ libxorg_gtest_main_la_CPPFLAGS = \
>   	$(AM_CPPFLAGS) \
>   	$(GTEST_CPPFLAGS)
>
> -libxorg_gtest_la_LDFLAGS = $(GTEST_DEPS_LIBS) -Wl,--version-script=libxorg-gtest.ver
> +libxorg_gtest_la_LDFLAGS = $(GTEST_DEPS_LIBS) -Wl,--version-script=$(top_srcdir)/src/libxorg-gtest.ver
>   libxorg_gtest_main_la_LDFLAGS = \
>   	$(GTEST_DEPS_LIBS) \
> -	-Wl,--version-script=libxorg-gtest_main.ver
> +	-Wl,--version-script=$(top_srcdir)/src/libxorg-gtest_main.ver
>
>   AM_CXXFLAGS = -I$(top_srcdir)/include $(GTEST_DEPS_CFLAGS)

Looks good to me. Applied and pushed.

Thanks!

-- Chase


More information about the xorg-devel mailing list