X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=8f97c06cb7b58de5155b6ad00b547fac4f709631;hb=refs%2Fheads%2Ftizen_3.0.2015.q2_common;hp=9cd83265dba72e082be51f615c8e2d1505636d10;hpb=6f14e5905d04da492f160cac6ac5a6fc7fd00134;p=platform%2Fupstream%2Fkmscon.git

diff --git a/Makefile.am b/Makefile.am
index 9cd8326..8f97c06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,6 +131,7 @@ CLEANFILES += src/*.bin.lo src/*.bin.o
 
 src/%.bin.lo: src/%.bin
 	$(AM_V_GEN)$(LD) -r -o "src/$*.bin.o" -z noexecstack --format=binary "$<"
+	$(AM_V_at)$(OBJCOPY) --rename-section .data=.rodata,alloc,load,readonly,data,contents "src/$*.bin.o"
 	$(AM_V_at)echo "# $@ - a libtool object file" >"$@"
 	$(AM_V_at)echo "# Generated by $(shell $(LIBTOOL) --version | head -n 1)" >>"$@"
 	$(AM_V_at)echo "#" >>"$@"
@@ -154,12 +155,12 @@ src/%.bin.lo: src/%.bin
 #  ^/*.*$     Start of multi-line comment
 #  ^ *.*$     Multi-line comment body
 #  ^[ \t]*    Indentation whitespace
-#  \n         Newlines
+#  [\r\n]     Newlines
 #
 
 CLEANFILES += src/*.vert.bin src/*.frag.bin
 SHADER_SED = -e 's/^\/\*.*$$//' -e 's/^ \*.*$$//' -e 's/^[ \t]*//'
-SHADER_TR = -d "\n"
+SHADER_TR = -d "\r\n"
 
 src/%.vert.bin: $(top_srcdir)/src/%.vert
 	$(AM_V_at)$(SED) $(SHADER_SED) "$<" | tr $(SHADER_TR) >"$@"
@@ -168,6 +169,28 @@ src/%.frag.bin: $(top_srcdir)/src/%.frag
 	$(AM_V_at)$(SED) $(SHADER_SED) "$<" | tr $(SHADER_TR) >"$@"
 
 #
+# XKB Fallback Converter
+# We use a static built-in XKB fallback keymap. To avoid huge memory consumption
+# we remove useless lines/characters first.
+# We also append an ASCII 0 character so it can be used as regular C-string.
+#
+# Following regexp are used to remove characters/lines:
+#   *= *           Whitespace around assignments
+#   *, *           Whitespace around commatas
+#   *[][{}()] *    Whitespace around braces
+#  ^[ \t]*         Indentation whitespace
+#  [\r\n]          Newlines
+#
+
+CLEANFILES += src/*.xkb.bin
+XKB_SED = -e 's/^[ \t]*//' -e 's/ *\([,=]\) */\1/g' -e 's/ *\([][{}()]\) */\1/g'
+XKB_TR = -d "\r\n"
+
+src/%.xkb.bin: $(top_srcdir)/src/%.xkb
+	$(AM_V_at)$(SED) $(XKB_SED) "$<" | tr $(XKB_TR) >"$@"
+	$(AM_V_at)echo -ne "\x00" >>"$@"
+
+#
 # SHL - Static Helper Library
 # The SHL subsystem contains several small code pieces used all over kmscon and
 # other applications.
@@ -191,9 +214,7 @@ libshl_la_SOURCES = \
 	src/shl_hook.h \
 	src/shl_misc.h \
 	src/shl_register.h \
-	src/shl_flagset.h \
-	src/shl_gl.h \
-	src/shl_gl_math.c
+	src/shl_flagset.h
 libshl_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(XKBCOMMON_CFLAGS) \
@@ -206,7 +227,7 @@ libshl_la_LIBADD = \
 	$(XKBCOMMON_LIBS)
 
 if BUILD_HAVE_GLES2
-libshl_la_SOURCES += src/shl_gl_shader.c
+libshl_la_SOURCES += src/shl_gl.h src/shl_gl_shader.c src/shl_gl_math.c
 libshl_la_CPPFLAGS += $(GLES2_CFLAGS)
 libshl_la_LIBADD += $(GLES2_LIBS)
 endif
@@ -261,7 +282,8 @@ libuterm_la_LIBADD = \
 	$(UDEV_LIBS) \
 	$(XKBCOMMON_LIBS) \
 	libeloop.la \
-	libshl.la
+	libshl.la \
+	src/uterm_input_fallback.xkb.bin.lo
 libuterm_la_LDFLAGS = \
 	$(AM_LDFLAGS)
 
@@ -393,7 +415,12 @@ mod_bbulk_la_SOURCES = \
 	src/kmscon_module_interface.h \
 	src/text_bbulk.c \
 	src/kmscon_mod_bbulk.c
-mod_bbulk_la_LIBADD = libshl.la
+mod_bbulk_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(TSM_CFLAGS)
+mod_bbulk_la_LIBADD = \
+	$(TSM_LIBS) \
+	libshl.la
 mod_bbulk_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-module \
@@ -409,9 +436,11 @@ mod_gltex_la_SOURCES = \
 	src/kmscon_mod_gltex.c
 mod_gltex_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
+	$(TSM_CFLAGS) \
 	$(GLES2_CFLAGS)
 mod_gltex_la_LIBADD = \
 	$(GLES2_LIBS) \
+	$(TSM_LIBS) \
 	libshl.la \
 	src/text_gltex_atlas.vert.bin.lo \
 	src/text_gltex_atlas.frag.bin.lo