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

Gaetan Nadon memsize at videotron.ca
Thu Apr 3 16:34:31 PDT 2014


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

Reviewed-by: Josh Triplett <josh at joshtriplett.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 image/Makefile.am |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/image/Makefile.am b/image/Makefile.am
index 30e9c87..9e38277 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -3,11 +3,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



More information about the Xcb mailing list