diff options
| author | Sergey V. Udaltsov <svu@gnome.org> | 2010-10-03 08:42:48 +0100 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2010-10-03 08:42:48 +0100 |
| commit | a177d5a7e194cfc106a906ca0d81b16a99fe02ee (patch) | |
| tree | 346094feef799818199a2519665097456247b918 /libgnomekbd/Makefile.am | |
| parent | f05774eace6d681b0fc59b2abee650b847fff8a1 (diff) | |
| download | libgnomekbd-a177d5a7e194cfc106a906ca0d81b16a99fe02ee.tar.gz | |
Moving from gconf to gsettings. API/ABI changes
Diffstat (limited to 'libgnomekbd/Makefile.am')
| -rw-r--r-- | libgnomekbd/Makefile.am | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am index ed796cf..509d6f2 100644 --- a/libgnomekbd/Makefile.am +++ b/libgnomekbd/Makefile.am @@ -3,10 +3,14 @@ lib_LTLIBRARIES = libgnomekbd.la libgnomekbdui.la uidir="$(pkgdatadir)/ui" ui_DATA = show-layout.ui +gsettings_SCHEMAS = org.gnome.libgnomekbd.desktop.gschema.xml \ + org.gnome.libgnomekbd.keyboard.gschema.xml \ + org.gnome.libgnomekbd.gschema.xml +@GSETTINGS_RULES@ + common_CFLAGS = \ -I$(top_srcdir) -Wall \ $(GDK_CFLAGS) \ - $(GCONF_CFLAGS) \ $(LIBXKLAVIER_CFLAGS) \ $(XLIB_CFLAGS) \ -I$(top_srcdir)/intl \ @@ -26,7 +30,6 @@ common_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined common_LIBADD = \ $(GDK_LIBS) \ - $(GCONF_LIBS) \ $(LIBXKLAVIER_LIBS) \ $(XLIB_LIBS) @@ -72,15 +75,13 @@ gnomekbdinc_HEADERS = \ @INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_SCHEMAS_RULE@ - noinst_HEADERS = gkbd-indicator-plugin-manager.h \ $(extra_nih) \ gkbd-config-private.h EXTRA_DIST = gkbd-indicator-marshal.list \ gkbd-keyboard-drawing-marshal.list \ - $(schema_in_files) $(ui_DATA) + $(ui_DATA) $(gsettings_SCHEMAS) GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0) @@ -102,20 +103,3 @@ gkbd-keyboard-drawing-marshal.c: gkbd-keyboard-drawing-marshal.h && mv gkbd-keyboard-drawing-marshal.tmp gkbd-keyboard-drawing-marshal.c ) \ || ( rm -f gkbd-keyboard-drawing-marshal.tmp && exit 1 ) -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files= desktop_gnome_peripherals_keyboard_xkb.schemas.in - -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -if GCONF_SCHEMAS_INSTALL -# don't do this if we are building in eg. rpm -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ - fi -else -install-data-local: -endif - |