diff options
| author | Emil Velikov <[email protected]> | 2016-04-20 22:12:54 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 08:38:04 +0100 |
| commit | 21800d77ff852c54c9311d25a4b3d7f42c747444 (patch) | |
| tree | a38368c90ce5491eb02c81dffb456870df9bacdb | |
| parent | 623cb3a598993ea42970d3121240af12aef66cd0 (diff) | |
anv: kill off custom CFLAGS
AM_CFLAGS already does all that we need.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 03c2365b3b9..3b0238fe2e9 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -68,7 +68,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/intel -libvulkan_intel_la_CFLAGS = $(CFLAGS) -DVK_USE_PLATFORM_XCB_KHR -Wno-override-init -msse2 +AM_CFLAGS = -DVK_USE_PLATFORM_XCB_KHR -Wno-override-init -msse2 VULKAN_SOURCES = \ $(VULKAN_FILES) \ @@ -78,16 +78,16 @@ BUILT_SOURCES = \ $(VULKAN_GENERATED_FILES) -libanv_gen7_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=70 +libanv_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70 libanv_gen7_la_SOURCES = $(GEN7_FILES) -libanv_gen75_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=75 +libanv_gen75_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=75 libanv_gen75_la_SOURCES = $(GEN75_FILES) -libanv_gen8_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=80 +libanv_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80 libanv_gen8_la_SOURCES = $(GEN8_FILES) -libanv_gen9_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=90 +libanv_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90 libanv_gen9_la_SOURCES = $(GEN9_FILES) if HAVE_EGL_PLATFORM_WAYLAND @@ -105,7 +105,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/egl/wayland/wayland-drm VULKAN_SOURCES += \ wayland-drm-protocol.c \ $(VULKAN_WSI_WAYLAND_FILES) -libvulkan_intel_la_CFLAGS += -DHAVE_WAYLAND_PLATFORM -DVK_USE_PLATFORM_WAYLAND_KHR +AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM -DVK_USE_PLATFORM_WAYLAND_KHR VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR endif @@ -157,10 +157,6 @@ libvulkan_test_la_SOURCES = \ $(VULKAN_SOURCES) \ $(VULKAN_GEM_STUB_FILES) -libvulkan_test_la_CFLAGS = \ - -I$(top_srcdir)/src/intel/vulkan \ - $(libvulkan_intel_la_CFLAGS) - libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD) include $(top_srcdir)/install-lib-links.mk |