From 49cac8005cae5cf2183bbb2541a9f6bbe1a0b8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Fri, 7 Oct 2016 13:26:39 +0200 Subject: [PATCH] libs/vkd3d-common: Add convenience library for shared code. --- Makefile.am | 7 +++++-- {libs/vkd3d => include/private}/vkd3d_common.h | 0 {libs/vkd3d => include/private}/vkd3d_debug.h | 0 libs/{vkd3d => vkd3d-common}/debug.c | 0 4 files changed, 5 insertions(+), 2 deletions(-) rename {libs/vkd3d => include/private}/vkd3d_common.h (100%) rename {libs/vkd3d => include/private}/vkd3d_debug.h (100%) rename libs/{vkd3d => vkd3d-common}/debug.c (100%) diff --git a/Makefile.am b/Makefile.am index 79b707a1..3a90e6fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,16 +18,19 @@ vkd3d_tests = \ BUILT_SOURCES = $(widl_headers) CLEANFILES = $(widl_headers) +noinst_LTLIBRARIES = libvkd3d-common.la +libvkd3d_common_la_SOURCES = \ + libs/vkd3d-common/debug.c + lib_LTLIBRARIES = libvkd3d.la libvkd3d_la_SOURCES = \ libs/vkd3d/command.c \ - libs/vkd3d/debug.c \ libs/vkd3d/device.c \ libs/vkd3d/resource.c \ libs/vkd3d/state.c \ libs/vkd3d/utils.c \ libs/vkd3d/vkd3d_main.c -libvkd3d_la_LIBADD = @PTHREAD_LIBS@ +libvkd3d_la_LIBADD = libvkd3d-common.la @PTHREAD_LIBS@ pkgconfigdir = $(libdir)/pkgconfig pkginclude_HEADERS = $(vkd3d_public_headers) diff --git a/libs/vkd3d/vkd3d_common.h b/include/private/vkd3d_common.h similarity index 100% rename from libs/vkd3d/vkd3d_common.h rename to include/private/vkd3d_common.h diff --git a/libs/vkd3d/vkd3d_debug.h b/include/private/vkd3d_debug.h similarity index 100% rename from libs/vkd3d/vkd3d_debug.h rename to include/private/vkd3d_debug.h diff --git a/libs/vkd3d/debug.c b/libs/vkd3d-common/debug.c similarity index 100% rename from libs/vkd3d/debug.c rename to libs/vkd3d-common/debug.c