From e12eb4be6d83cff082bdfa5fb22bf689db79c5d3 Mon Sep 17 00:00:00 2001 From: William Hua Date: Fri, 13 Jun 2014 09:50:24 -0400 Subject: Basic Fcitx support. --- lib/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index a19016d9..ae9dec00 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -26,6 +26,7 @@ indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \ --pkg Xkl-1.0 \ --pkg Gkbd-3.0 \ --pkg ibus-1.0 \ + --pkg fcitx \ --pkg accountsservice \ --pkg liblightdm-gobject-1 indicator_keyboard_service_CFLAGS = $(AM_CFLAGS) \ @@ -36,6 +37,7 @@ indicator_keyboard_service_CFLAGS = $(AM_CFLAGS) \ $(LIBXKLAVIER_CFLAGS) \ $(LIBGNOMEKBD_CFLAGS) \ $(IBUS_CFLAGS) \ + $(FCITX_GCLIENT_CFLAGS) \ $(ACCOUNTSSERVICE_CFLAGS) \ $(LIGHTDM_CFLAGS) \ $(COVERAGE_CFLAGS) @@ -47,6 +49,7 @@ indicator_keyboard_service_LDFLAGS = $(AM_LDFLAGS) \ $(LIBXKLAVIER_LIBS) \ $(LIBGNOMEKBD_LIBS) \ $(IBUS_LIBS) \ + $(FCITX_GCLIENT_LIBS) \ $(ACCOUNTSSERVICE_LIBS) \ $(LIGHTDM_LIBS) \ $(COVERAGE_LDFLAGS) -- cgit v1.2.3 From 66693b52961aa9197c54c508223ec12c1156a691 Mon Sep 17 00:00:00 2001 From: William Hua Date: Tue, 17 Jun 2014 00:31:11 -0400 Subject: Disable experimental non-null. --- lib/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index ae9dec00..16b8807c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,8 +2,7 @@ libexec_PROGRAMS = indicator-keyboard-service AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API AM_LDFLAGS = -lm -AM_VALAFLAGS = --enable-experimental-non-null \ - --metadatadir $(top_srcdir)/deps \ +AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \ --vapidir $(top_srcdir)/deps indicator_keyboard_service_SOURCES = main.vala \ -- cgit v1.2.3 From 98e2925f8960a3f3020c43a86b9a1da140111d88 Mon Sep 17 00:00:00 2001 From: William Hua Date: Wed, 6 Aug 2014 14:25:09 +0800 Subject: Re-enable experimental non-null. --- lib/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 6543ccd4..14c8f1ba 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,8 @@ pkglibexec_PROGRAMS = indicator-keyboard-service AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API AM_LDFLAGS = -lm -AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \ +AM_VALAFLAGS = --enable-experimental-non-null \ + --metadatadir $(top_srcdir)/deps \ --vapidir $(top_srcdir)/deps indicator_keyboard_service_SOURCES = main.vala \ -- cgit v1.2.3 From 775f8b26f2fd2d3cb7d604754e853aaed83070ad Mon Sep 17 00:00:00 2001 From: William Hua Date: Wed, 18 Feb 2015 12:20:10 -0500 Subject: Remove vapi. --- lib/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 14c8f1ba..d45b98dd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,12 +22,12 @@ indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \ --pkg pangocairo \ --pkg gtk+-3.0 \ --pkg GDesktopEnums-3.0 \ - --pkg gnome-desktop-3.0 \ + --pkg GnomeDesktop-3.0 \ --pkg Xkl-1.0 \ --pkg Gkbd-3.0 \ --pkg ibus-1.0 \ - --pkg fcitx \ - --pkg accountsservice \ + --pkg Fcitx-1.0 \ + --pkg AccountsService-1.0 \ --pkg liblightdm-gobject-1 indicator_keyboard_service_CFLAGS = $(AM_CFLAGS) \ $(GEE_CFLAGS) \ -- cgit v1.2.3