[Xcb] [PATCH RESEND image 11/12] test: use AM_CPPFLAGS rather than per-target test_swap_CPPFLAGS aand others

[Josh Triplett]

On Thu, Mar 27, 2014 at 02:38:47PM -0400, Gaetan Nadon wrote:
> There is only one target in this directory, so we do not need to trigger
> the per-target infrastructure which would require AC_PROG_CC_C_O macro.
> 
> http://www.gnu.org/software/automake/manual/automake.html#Renamed-Objects
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

"one target in this directory" does not seem accurate in this case.

Also, test_formats_CPPFLAGS had $(XPROTO_CFLAGS), which got lost in the
move to AM_CPPFLAGS.

>  test/Makefile.am |   11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/test/Makefile.am b/test/Makefile.am
> index 1116473..dfe8b3f 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -8,22 +8,23 @@ check_PROGRAMS = test_swap
>  
>  TESTS=test_swap
>  
> +AM_CPPFLAGS = 			\
> +	$(XCB_CFLAGS)		\
> +	$(XCB_SHM_CFLAGS)	\
> +	$(XCB_UTIL_CFLAGS)	\
> +	-I$(top_srcdir)/image
> +
>  test_swap_SOURCES = test_swap.c
> -test_swap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
>  test_swap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
>  
>  test_xcb_image_SOURCES = test_xcb_image.c
> -test_xcb_image_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
>  test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
>  
>  test_xcb_image_shm_SOURCES = test_xcb_image_shm.c
> -test_xcb_image_shm_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
>  test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
>  
>  test_formats_SOURCES = test_formats.c
> -test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) $(XPROTO_CFLAGS) -I$(top_srcdir)/image
>  test_formats_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
>  
>  test_bitmap_SOURCES = test_bitmap.c test.xbm
> -test_bitmap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)  -I$(top_srcdir)/image
>  test_bitmap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Xcb mailing list
> Xcb at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xcb