[Xcb] [PATCH RESEND image 10/12] image: use AM_CPPFLAGS rather than per-target libxcb_image_la_CPPFLAGS

[Josh Triplett]

On Thu, Mar 27, 2014 at 02:38:46PM -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.
> So libxcb_image_la-xcb_image.o simply becomes xcb_image.o.
> 
> http://www.gnu.org/software/automake/manual/automake.html#Renamed-Objects
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

Reviewed-by: Josh Triplett <josh at joshtriplett.org>

>  image/Makefile.am |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/image/Makefile.am b/image/Makefile.am
> index 89ea2f4..39012f2 100644
> --- a/image/Makefile.am
> +++ b/image/Makefile.am
> @@ -4,11 +4,15 @@ lib_LTLIBRARIES = libxcb-image.la
>  xcbinclude_HEADERS = xcb_image.h xcb_pixel.h xcb_bitops.h
>  
>  AM_CFLAGS = $(CWARNFLAGS)
> +AM_CPPFLAGS = 			\
> +	$(XCB_CFLAGS)		\
> +	$(XCB_SHM_CFLAGS)	\
> +	$(XCB_UTIL_CFLAGS)	\
> +	$(XPROTO_CFLAGS)
>  
>  XCB_IMAGE_LIBS = libxcb-image.la
>  
>  libxcb_image_la_SOURCES = xcb_image.c
> -libxcb_image_la_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) $(XPROTO_CFLAGS)
>  libxcb_image_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_UTIL_LIBS)
>  libxcb_image_la_LDFLAGS = -no-undefined
>  
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Xcb mailing list
> Xcb at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xcb