From 36229497f16a403b0716b47dfae99dca0c5b5dd4 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 24 Jan 2018 22:37:38 +0100 Subject: [PATCH] yaft: actually build yaft_priv class Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d5dcee0b1a69bfa7ed8adee7cd685bd3ea35a240 Author: Stefan Seyfried Date: 2018-01-24 (Wed, 24 Jan 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/yaft/Makefile.am | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/src/gui/widget/yaft/Makefile.am b/src/gui/widget/yaft/Makefile.am index 9cee5d14b..0ebc39bcc 100644 --- a/src/gui/widget/yaft/Makefile.am +++ b/src/gui/widget/yaft/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS AM_CPPFLAGS += \ @@ -8,6 +10,7 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libconfigfile \ + -I$(srcdir) \ @SIGC_CFLAGS@ \ @FREETYPE_CFLAGS@ \ @LUA_CFLAGS@ \ @@ -15,28 +18,9 @@ AM_CPPFLAGS += \ noinst_LIBRARIES = libneutrino_gui_terminal.a -HDR = glyph.h yaft.h conf.h color.h parse.h terminal.h util.h \ - ctrlseq/esc.h ctrlseq/csi.h ctrlseq/osc.h ctrlseq/dcs.h \ - fb/common.h fb/linux.h fb/freebsd.h fb/netbsd.h fb/openbsd.h \ - x/x.h - libneutrino_gui_terminal_a_SOURCES = \ + ctrlseq/esc.cpp \ + ctrlseq/csi.cpp \ + ctrlseq/osc.cpp \ + yaft_priv.cpp \ yaft_class.cpp - -# glyph.h \ -# yaft.h \ -# conf.h \ -# color.h \ -# parse.h \ -# terminal.h \ -# util.h \ -# ctrlseq/esc.h \ -# ctrlseq/csi.h \ -# ctrlseq/osc.h \ -# ctrlseq/dcs.h \ -# fb/common.h \ -# fb/linux.h \ -# fb/freebsd.h \ -# fb/netbsd.h \ -# fb/openbsd.h \ -# x/x.h