From 89a9ea36ffa2e45560dfd5f3dd9fb427a6004c47 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 24 Jun 2012 20:43:34 +0200 Subject: [PATCH] build: put static_* files into separate library We now build all small helpers into a separate small library that can be linked statically into all our others. That is, we don't need to keep backwards compatibility or anything inside this library. Signed-off-by: David Herrmann --- Makefile.am | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7b05206..4896153 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = \ test_vt \ test_input noinst_PROGRAMS = genshader -noinst_LTLIBRARIES = libkmscon-core.la +noinst_LTLIBRARIES = libkmscon-core.la libkmscon-static.la AM_CFLAGS = \ -Wall @@ -42,7 +42,6 @@ nodist_libkmscon_core_la_SOURCES = \ libkmscon_core_la_SOURCES = \ src/conf.c src/conf.h \ - src/static_misc.c src/static_misc.h \ src/ui.c src/ui.h \ src/console.c src/console.h \ src/unicode.c src/unicode.h \ @@ -110,8 +109,19 @@ libkmscon_core_la_LIBADD = \ $(GLIB_LIBS) \ -lpthread +libkmscon_static_la_SOURCES = \ + src/static_llog.h \ + src/static_misc.h \ + src/static_misc.c + +libkmscon_static_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(GLIB_CFLAGS) +libkmscon_static_la_LIBADD = \ + $(GLIB_LIBS) + kmscon_SOURCES = src/main.c -kmscon_LDADD = libkmscon-core.la +kmscon_LDADD = libkmscon-core.la libkmscon-static.la test_output_SOURCES = tests/test_output.c tests/test_include.h test_output_LDADD = libkmscon-core.la