summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2014-02-20 14:27:18 -0500
committerGaetan Nadon <memsize@videotron.ca>2014-04-17 10:21:14 -0400
commitf3a7f6b0de192299026d7144e931e0924cd649f6 (patch)
tree4363f1c10dd9de1db38b52d997095907fe256698
parentd26dd5b14015a4f90197740bd8b2f20a0df77c8c (diff)
downloadutil-image-f3a7f6b0de192299026d7144e931e0924cd649f6.tar.gz
image: use AM_CPPFLAGS rather than per-target libxcb_image_la_CPPFLAGS
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: Uli Schlachter <psychon@znc.in> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--image/Makefile.am6
1 files changed, 5 insertions, 1 deletions
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