diff options
| author | Stefano Karapetsas <[email protected]> | 2012-09-03 17:14:37 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-09-03 17:14:37 +0200 |
| commit | 74e8c123722068886a8b12872601b14f5cc3bbe9 (patch) | |
| tree | dd680caed288f9056b31d26221c8f007dc1740d6 /libmatekbd/Makefile.am | |
| parent | 35c8125877e60b0c3279dd15b26bf0e85df5b136 (diff) | |
| download | libmatekbd-74e8c123722068886a8b12872601b14f5cc3bbe9.tar.bz2 libmatekbd-74e8c123722068886a8b12872601b14f5cc3bbe9.tar.xz | |
migrate to gsettings
Diffstat (limited to 'libmatekbd/Makefile.am')
| -rw-r--r-- | libmatekbd/Makefile.am | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/libmatekbd/Makefile.am b/libmatekbd/Makefile.am index 1bcfcd2..b27a6d4 100644 --- a/libmatekbd/Makefile.am +++ b/libmatekbd/Makefile.am @@ -6,11 +6,10 @@ ui_DATA = show-layout.ui common_CFLAGS = \ -I$(top_srcdir) -Wall \ $(GDK_CFLAGS) \ - $(MATECONF_CFLAGS) \ + $(GIO_CFLAGS) \ $(LIBXKLAVIER_CFLAGS) \ $(XLIB_CFLAGS) \ -I$(top_srcdir)/intl \ - -DSYS_PLUGIN_DIR=\"$(libdir)/matekbd/\" \ -DG_LOG_DOMAIN=\"MateKbdIndicator\" \ -DDATADIR=\"$(datadir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ @@ -26,7 +25,7 @@ common_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined common_LIBADD = \ $(GDK_LIBS) \ - $(MATECONF_LIBS) \ + $(GIO_LIBS) \ $(LIBXKLAVIER_LIBS) \ $(XLIB_LIBS) @@ -50,7 +49,6 @@ libmatekbdui_la_SOURCES = \ matekbd-indicator.c \ matekbd-status.c \ matekbd-indicator-marshal.c \ - matekbd-indicator-plugin-manager.c \ matekbd-keyboard-drawing-marshal.c \ matekbd-keyboard-drawing.c @@ -68,7 +66,6 @@ matekbdinc_HEADERS = \ matekbd-indicator.h \ matekbd-status.h \ matekbd-indicator-config.h \ - matekbd-indicator-plugin.h \ matekbd-keyboard-drawing.h \ matekbd-util.h @@ -76,8 +73,7 @@ matekbdinc_HEADERS = \ @INTLTOOL_SCHEMAS_RULE@ -noinst_HEADERS = matekbd-indicator-plugin-manager.h \ - $(extra_nih) \ +noinst_HEADERS = $(extra_nih) \ matekbd-config-private.h EXTRA_DIST = matekbd-indicator-marshal.list \ @@ -104,20 +100,5 @@ matekbd-keyboard-drawing-marshal.c: matekbd-keyboard-drawing-marshal.h && mv matekbd-keyboard-drawing-marshal.tmp matekbd-keyboard-drawing-marshal.c ) \ || ( rm -f matekbd-keyboard-drawing-marshal.tmp && exit 1 ) -schemadir = $(MATECONF_SCHEMA_FILE_DIR) -schema_in_files= desktop_mate_peripherals_keyboard_xkb.schemas.in - -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -if MATECONF_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 \ - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $$p; \ - done \ - fi -else -install-data-local: -endif - +gsettings_SCHEMAS = org.mate.peripherals-keyboard-xkb.gschema.xml +@GSETTINGS_RULES@ |