diff options
| author | Ossama Othman <ossama.othman@intel.com> | 2013-04-30 14:37:25 -0700 |
|---|---|---|
| committer | Ossama Othman <ossama.othman@intel.com> | 2013-04-30 14:37:25 -0700 |
| commit | 207a8c6b827716bf9138e6761c3f81a558837fbf (patch) | |
| tree | 812546926361ad10d34c276f31949ea291163130 /src/Makefile.am | |
| parent | 23fb3f796ce8373a34c5aef901267bad18956547 (diff) | |
| download | ico-uxf-weston-plugin-207a8c6b827716bf9138e6761c3f81a558837fbf.tar.gz ico-uxf-weston-plugin-207a8c6b827716bf9138e6761c3f81a558837fbf.tar.bz2 ico-uxf-weston-plugin-207a8c6b827716bf9138e6761c3f81a558837fbf.zip | |
Port ico-uxf-weston-plugin to use Weston 1.0.6 plugin API.
Change-Id: I7206280c389318a4b6492e36871c11bc2739f0ed
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9401246..4031d79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,8 +10,8 @@ includedir = /usr/include/ico-uxf-weston-plugin libico_uxf_weston_plugin_la_LIBADD = -lrt -lm libico_uxf_weston_plugin_la_LDFLAGS = -version-info 0:5:0 libico_uxf_weston_plugin_la_SOURCES = \ - ico_ivi_shell-protocol.c \ - ico_window_mgr-protocol.c \ + ico_ivi_shell-protocol.c \ + ico_window_mgr-protocol.c \ ico_input_mgr-protocol.c AM_CPPFLAGS = \ @@ -41,59 +41,58 @@ module_LTLIBRARIES = \ # Weston Plugin Loader ico_plugin_loader = ico_plugin_loader.la ico_plugin_loader_la_LDFLAGS = -module -avoid-version -ico_plugin_loader_la_LIBADD = $(COMPOSITOR_LIBS) -ico_plugin_loader_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(COMPOSITOR_CFLAGS) +ico_plugin_loader_la_LIBADD = $(PLUGIN_LIBS) +ico_plugin_loader_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(PLUGIN_CFLAGS) ico_plugin_loader_la_SOURCES = \ - ico_plugin_loader.c ../shared/config-parser.c + ico_plugin_loader.c # IVI Common Functions ico_ivi_common = ico_ivi_common.la ico_ivi_common_la_LDFLAGS = -module -avoid-version -ico_ivi_common_la_LIBADD = $(COMPOSITOR_LIBS) -ico_ivi_common_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(COMPOSITOR_CFLAGS) +ico_ivi_common_la_LIBADD = $(PLUGIN_LIBS) +ico_ivi_common_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(PLUGIN_CFLAGS) ico_ivi_common_la_SOURCES = \ - ico_ivi_common.c ../shared/config-parser.c + ico_ivi_common.c # IVI-Shell ico_ivi_shell = ico_ivi_shell.la ico_ivi_shell_la_LDFLAGS = -module -avoid-version -ico_ivi_shell_la_LIBADD = $(COMPOSITOR_LIBS) -ico_ivi_shell_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(COMPOSITOR_CFLAGS) +ico_ivi_shell_la_LIBADD = $(PLUGIN_LIBS) +ico_ivi_shell_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(PLUGIN_CFLAGS) ico_ivi_shell_la_SOURCES = \ - ico_ivi_shell.c \ - ../shared/config-parser.c \ + ico_ivi_shell.c \ ico_ivi_shell-protocol.c \ ico_ivi_shell-server-protocol.h # Multi Window Manager ico_window_mgr = ico_window_mgr.la ico_window_mgr_la_LDFLAGS = -module -avoid-version -ico_window_mgr_la_LIBADD = $(COMPOSITOR_LIBS) $(AUL_LIBS) -ico_window_mgr_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(COMPOSITOR_CFLAGS) +ico_window_mgr_la_LIBADD = $(PLUGIN_LIBS) $(AUL_LIBS) +ico_window_mgr_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(PLUGIN_CFLAGS) ico_window_mgr_la_SOURCES = \ - ico_window_mgr.c \ + ico_window_mgr.c \ ico_window_mgr-protocol.c \ ico_window_mgr-server-protocol.h # Multi Input Manager ico_input_mgr = ico_input_mgr.la ico_input_mgr_la_LDFLAGS = -module -avoid-version -ico_input_mgr_la_LIBADD = $(COMPOSITOR_LIBS) -ico_input_mgr_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(COMPOSITOR_CFLAGS) +ico_input_mgr_la_LIBADD = $(PLUGIN_LIBS) +ico_input_mgr_la_CFLAGS = $(GCC_CFLAGS) $(EXT_CFLAGS) $(PLUGIN_CFLAGS) ico_input_mgr_la_SOURCES = \ - ico_input_mgr.c \ + ico_input_mgr.c \ ico_input_mgr-protocol.c \ ico_input_mgr-server-protocol.h # Wayland protocol(Build by wayland-scanner) -BUILT_SOURCES = \ - ico_ivi_shell-protocol.c \ +BUILT_SOURCES = \ + ico_ivi_shell-protocol.c \ ico_ivi_shell-server-protocol.h \ ico_ivi_shell-client-protocol.h \ - ico_window_mgr-protocol.c \ + ico_window_mgr-protocol.c \ ico_window_mgr-server-protocol.h \ ico_window_mgr-client-protocol.h \ - ico_input_mgr-protocol.c \ + ico_input_mgr-protocol.c \ ico_input_mgr-server-protocol.h \ ico_input_mgr-client-protocol.h \ git-version.h |