Modify it to adjust Tizen IVI enviroment

[platform/upstream/kmscon.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5478d0c..8f97c06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,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) >"$@"
@@ -214,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) \
@@ -229,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
@@ -417,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 \
@@ -433,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