diff options
| author | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
|---|---|---|
| committer | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
| commit | bf2aab363e93263b1615f1811524fb22b14bf34b (patch) | |
| tree | 406500af69bd6555eb4e4dc63e3711bd341bb6b4 /lib/Makefile.am | |
| parent | f10353bc4208a48339cdc1e0656361b16636a3e2 (diff) | |
| parent | f90c7c21d0e82779356eaa8ae471703cda45d7cc (diff) | |
| download | ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.gz ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.bz2 ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.zip | |
Merge trunk, resolving Makefile conflict.
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 72 |
1 files changed, 39 insertions, 33 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 2e257df0..72f5f949 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,41 +2,47 @@ 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 \ - source.vala \ - common.vala -indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \ - --pkg gee-1.0 \ - --pkg posix \ - --pkg pangocairo \ - --pkg gtk+-3.0 \ - --pkg GDesktopEnums-3.0 \ - --pkg gnome-desktop-3.0 \ - --pkg Xkl-1.0 \ - --pkg Gkbd-3.0 \ - --pkg ibus-1.0 \ +indicator_keyboard_service_SOURCES = main.vala \ + source.vala \ + common.vala \ + greeter.vala +indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \ + --pkg gee-1.0 \ + --pkg posix \ + --pkg pangocairo \ + --pkg gtk+-3.0 \ + --pkg GDesktopEnums-3.0 \ + --pkg gnome-desktop-3.0 \ + --pkg Xkl-1.0 \ + --pkg Gkbd-3.0 \ + --pkg ibus-1.0 \ + --pkg accountsservice \ + --pkg liblightdm-gobject-1 \ --pkg libbamf3 -indicator_keyboard_service_CFLAGS = $(AM_CFLAGS) \ - $(GEE_CFLAGS) \ - $(PANGOCAIRO_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GNOME_DESKTOP_CFLAGS) \ - $(LIBXKLAVIER_CFLAGS) \ - $(LIBGNOMEKBD_CFLAGS) \ - $(IBUS_CFLAGS) \ - $(BAMF_CFLAGS) \ +indicator_keyboard_service_CFLAGS = $(AM_CFLAGS) \ + $(GEE_CFLAGS) \ + $(PANGOCAIRO_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GNOME_DESKTOP_CFLAGS) \ + $(LIBXKLAVIER_CFLAGS) \ + $(LIBGNOMEKBD_CFLAGS) \ + $(IBUS_CFLAGS) \ + $(ACCOUNTSSERVICE_CFLAGS) \ + $(LIGHTDM_CFLAGS) \ + $(BAMF_CFLAGS) \ $(COVERAGE_CFLAGS) -indicator_keyboard_service_LDFLAGS = $(AM_LDFLAGS) \ - $(GEE_LIBS) \ - $(PANGOCAIRO_LIBS) \ - $(GTK_LIBS) \ - $(GNOME_DESKTOP_LIBS) \ - $(LIBXKLAVIER_LIBS) \ - $(LIBGNOMEKBD_LIBS) \ - $(IBUS_LIBS) \ - $(BAMF_LIBS) \ +indicator_keyboard_service_LDFLAGS = $(AM_LDFLAGS) \ + $(GEE_LIBS) \ + $(PANGOCAIRO_LIBS) \ + $(GTK_LIBS) \ + $(GNOME_DESKTOP_LIBS) \ + $(LIBXKLAVIER_LIBS) \ + $(LIBGNOMEKBD_LIBS) \ + $(IBUS_LIBS) \ + $(ACCOUNTSSERVICE_LIBS) \ + $(LIGHTDM_LIBS) \ + $(BAMF_LIBS) \ $(COVERAGE_LDFLAGS) |