clients: support ivi-application.xml for clients/simple-shm.c

[profile/ivi/weston-ivi-shell.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index daa29f2..6c5321f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ BUILT_SOURCES =
 # Do not run xwayland test while it is known broken.
 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install --disable-xwayland-test
 
-EXTRA_DIST = weston.ini.in
+EXTRA_DIST = weston.ini.in ivi-shell/weston.ini.in
 
 weston.ini : $(srcdir)/weston.ini.in
        $(AM_V_GEN)$(SED) \
@@ -20,7 +20,14 @@ weston.ini : $(srcdir)/weston.ini.in
                -e 's|@libexecdir[@]|$(libexecdir)|g' \
                $< > $@
 
-all-local : weston.ini
+ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
+       $(AM_V_GEN)$(SED) \
+               -e 's|@bindir[@]|$(bindir)|g' \
+               -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
+               -e 's|@libexecdir[@]|$(libexecdir)|g' \
+               $< > $@
+
+all-local : weston.ini ivi-shell/weston.ini
 
 AM_CFLAGS = $(GCC_CFLAGS)
 
@@ -36,7 +43,7 @@ AM_CPPFLAGS =                                         \
        -DLIBEXECDIR='"$(libexecdir)"'          \
        -DBINDIR='"$(bindir)"'
 
-CLEANFILES = weston.ini $(BUILT_SOURCES)
+CLEANFILES = weston.ini ivi-shell/weston.ini $(BUILT_SOURCES)
 
 bin_PROGRAMS += weston
 
@@ -364,6 +371,11 @@ libexec_PROGRAMS +=                                \
        weston-keyboard                         \
        weston-simple-im
 
+if ENABLE_IVI_SHELL
+libexec_PROGRAMS +=                            \
+       weston-ivi-shell-user-interface
+endif
+
 demo_clients =                                 \
        weston-flower                           \
        weston-image                            \
@@ -398,7 +410,9 @@ nodist_weston_simple_shm_SOURCES =          \
        protocol/xdg-shell-protocol.c           \
        protocol/xdg-shell-client-protocol.h    \
        protocol/fullscreen-shell-protocol.c    \
-       protocol/fullscreen-shell-client-protocol.h
+       protocol/fullscreen-shell-client-protocol.h     \
+       protocol/ivi-application-protocol.c             \
+       protocol/ivi-application-client-protocol.h
 weston_simple_shm_CFLAGS = $(AM_CFLAGS) $(SIMPLE_CLIENT_CFLAGS)
 weston_simple_shm_LDADD = $(SIMPLE_CLIENT_LIBS) libshared.la
 
@@ -590,6 +604,17 @@ nodist_weston_desktop_shell_SOURCES =                      \
 weston_desktop_shell_LDADD = libtoytoolkit.la
 weston_desktop_shell_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
+if ENABLE_IVI_SHELL
+weston_ivi_shell_user_interface_SOURCES = clients/ivi-shell-user-interface.c
+nodist_weston_ivi_shell_user_interface_SOURCES =                       \
+       protocol/ivi-hmi-controller-client-protocol.h                   \
+       protocol/ivi-hmi-controller-protocol.c                          \
+       protocol/ivi-application-client-protocol.h                      \
+        protocol/ivi-application-protocol.c
+weston_ivi_shell_user_interface_LDADD = libtoytoolkit.la
+weston_ivi_shell_user_interface_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
+endif
+
 if BUILD_FULL_GL_CLIENTS
 demo_clients += weston-gears
 weston_gears_SOURCES = clients/gears.c
@@ -636,8 +661,11 @@ BUILT_SOURCES +=                                   \
        protocol/fullscreen-shell-protocol.c            \
        protocol/fullscreen-shell-client-protocol.h     \
        protocol/xdg-shell-protocol.c                   \
-       protocol/xdg-shell-client-protocol.h
-
+       protocol/xdg-shell-client-protocol.h            \
+       protocol/ivi-hmi-controller-protocol.c          \
+       protocol/ivi-hmi-controller-client-protocol.h   \
+       protocol/ivi-application-protocol.c             \
+       protocol/ivi-application-client-protocol.h
 
 westondatadir = $(datadir)/weston
 dist_westondata_DATA =                         \
@@ -649,7 +677,19 @@ dist_westondata_DATA =                             \
        data/icon_window.png                    \
        data/sign_close.png                     \
        data/sign_maximize.png                  \
-       data/sign_minimize.png
+       data/sign_minimize.png                  \
+       data/background.png                     \
+       data/tiling.png                         \
+       data/fullscreen.png                     \
+       data/panel.png                          \
+       data/random.png                         \
+       data/sidebyside.png                     \
+       data/home.png                           \
+       data/icon_ivi_clickdot.png              \
+       data/icon_ivi_flower.png                \
+       data/icon_ivi_simple-egl.png            \
+       data/icon_ivi_simple-shm.png            \
+       data/icon_ivi_smoke.png
 
 
 if BUILD_WCAP_TOOLS
@@ -724,7 +764,8 @@ if ENABLE_IVI_SHELL
 
 module_LTLIBRARIES +=                          \
        $(ivi_layout)                           \
-       $(ivi_shell)
+       $(ivi_shell)                            \
+       $(hmi_controller)
 
 ivi_layout = ivi-layout.la
 ivi_layout_la_LDFLAGS = -module -avoid-version
@@ -750,6 +791,19 @@ nodist_ivi_shell_la_SOURCES =                      \
 
 BUILT_SOURCES += $(nodist_ivi_shell_la_SOURCES)
 
+hmi_controller = hmi-controller.la
+hmi_controller_la_LDFLAGS = -module -avoid-version
+hmi_controller_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la
+hmi_controller_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
+hmi_controller_la_SOURCES =                            \
+       ivi-shell/ivi-layout-export.h                   \
+       ivi-shell/hmi-controller.c
+nodist_hmi_controller_la_SOURCES =                     \
+       protocol/ivi-hmi-controller-protocol.c          \
+       protocol/ivi-hmi-controller-server-protocol.h
+
+BUILT_SOURCES += $(nodist_hmi_controller_la_SOURCES)
+
 endif
 
 
@@ -1031,7 +1085,8 @@ EXTRA_DIST +=                                     \
        protocol/xdg-shell.xml                  \
        protocol/fullscreen-shell.xml           \
        protocol/scaler.xml                     \
-       protocol/ivi-application.xml
+       protocol/ivi-application.xml            \
+       protocol/ivi-hmi-controller.xml
 
 man_MANS = weston.1 weston.ini.5