Józef Kucia : build: Do not build libvkd3d-shader as public library.

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Mon Jan 15 13:49:02 2018 +0100

build: Do not build libvkd3d-shader as public library.

libvkd3d-shader interface is expected to be extended significantly.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

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

diff --git a/Makefile.am b/Makefile.am
index 190a7ac..15a1783 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ vkd3d_public_headers = \
    include/vkd3d_d3d12.h \
    include/vkd3d_dxgibase.h \
    include/vkd3d_dxgiformat.h \
-	include/vkd3d_shader.h \
    include/vkd3d_utils.h \
    include/vkd3d_windows.h

@@ -49,13 +48,13 @@ vkd3d_demos_headers = \

BUILT_SOURCES = $(widl_headers)

-noinst_LTLIBRARIES = libvkd3d-common.la
+noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d-shader.la
 libvkd3d_common_la_SOURCES = \
    include/private/vkd3d_debug.h \
    libs/vkd3d-common/debug.c \
    libs/vkd3d-common/memory.c

-lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la
+lib_LTLIBRARIES = libvkd3d.la libvkd3d-utils.la

libvkd3d_shader_la_SOURCES = \
    include/private/list.h \
@@ -67,7 +66,7 @@ libvkd3d_shader_la_SOURCES = \
    libs/vkd3d-shader/spirv.c \
    libs/vkd3d-shader/vkd3d_shader_main.c \
    libs/vkd3d-shader/vkd3d_shader_private.h
-libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@
+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
 endif
@@ -110,7 +109,7 @@ EXTRA_DIST += libs/vkd3d/libvkd3d.pc.in libs/vkd3d-utils/libvkd3d-utils.pc.in

bin_PROGRAMS = vkd3d-compiler
 vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
-vkd3d_compiler_LDADD = libvkd3d-shader.la
+vkd3d_compiler_LDADD = libvkd3d-shader.la libvkd3d-common.la

LDADD = libvkd3d.la libvkd3d-utils.la
 check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)