=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: build: Do not drop AM_CFLAGS when adding per-target CFLAGS.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 9974237f35919989ad20c3d3307ddc3701943249
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=9974237f35919989ad20c3d3307ddc3701943249

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue May 29 12:50:28 2018 +0200

build: Do not drop AM_CFLAGS when adding per-target CFLAGS.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 494e378..52b3585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ libvkd3d_shader_la_SOURCES = \
 	libs/vkd3d-shader/vkd3d_shader.map \
 	libs/vkd3d-shader/vkd3d_shader_main.c \
 	libs/vkd3d-shader/vkd3d_shader_private.h
-libvkd3d_shader_la_CFLAGS = @SPIRV_TOOLS_CFLAGS@
+libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@
 libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@
 if HAVE_LD_VERSION_SCRIPT
 libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
@@ -130,7 +130,7 @@ tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@
 tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@
 
 DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@
-DEMOS_CFLAGS = @XCB_CFLAGS@
+DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@
 noinst_PROGRAMS += $(vkd3d_demos)
 EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers)