summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2014-02-06 16:55:50 -0500
committerArnaud Fontaine <arnau@debian.org>2014-02-07 19:02:10 +0900
commit1bdd2c56ebc9442ab2159f82d399848e7d97ccb9 (patch)
tree97f57458b004c1c6c783debe3c4bc0213db1483b
parentba897f290b0a71e7ffb8047bbd241da71ca47003 (diff)
downloadutil-wm-1bdd2c56ebc9442ab2159f82d399848e7d97ccb9.tar.gz
make: use AM_CPPFLAGS rather than per-target libxcb_*_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_ewmh_la-ewmh.o simply becomes ewmh.o. http://www.gnu.org/software/automake/manual/automake.html#Renamed-Objects Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Arnaud Fontaine <arnau@debian.org>
-rw-r--r--ewmh/Makefile.am2
-rw-r--r--icccm/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am
index 49e2ad8..9a2acd8 100644
--- a/ewmh/Makefile.am
+++ b/ewmh/Makefile.am
@@ -5,10 +5,10 @@ lib_LTLIBRARIES = libxcb-ewmh.la
nodist_xcbinclude_HEADERS = xcb_ewmh.h
AM_CFLAGS = $(CWARNFLAGS)
+AM_CPPFLAGS = $(XCB_CFLAGS)
libxcb_ewmh_la_SOURCES = ewmh.c.m4 atomlist.m4 xcb_ewmh.h.m4
nodist_libxcb_ewmh_la_SOURCES = ewmh.c
-libxcb_ewmh_la_CPPFLAGS = $(XCB_CFLAGS)
libxcb_ewmh_la_LIBADD = $(XCB_LIBS)
libxcb_ewmh_la_LDFLAGS = -version-info 2:0:0 -no-undefined
diff --git a/icccm/Makefile.am b/icccm/Makefile.am
index 32b6f92..5850db4 100644
--- a/icccm/Makefile.am
+++ b/icccm/Makefile.am
@@ -6,9 +6,9 @@ lib_LTLIBRARIES = libxcb-icccm.la
xcbinclude_HEADERS = xcb_icccm.h
AM_CFLAGS = $(CWARNFLAGS)
+AM_CPPFLAGS = $(XCB_CFLAGS)
libxcb_icccm_la_SOURCES = icccm.c
-libxcb_icccm_la_CPPFLAGS = $(XCB_CFLAGS)
libxcb_icccm_la_LIBADD = $(XCB_LIBS)
libxcb_icccm_la_LDFLAGS = -version-info 4:0:0 -no-undefined