diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-06 14:22:49 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-06 14:22:49 -0800 |
| commit | 684e6bb4c072f707a92ce72d85954b5790aaab53 (patch) | |
| tree | e8a449764975fe5066a67c9275ea73c56a88309b /src/Makefile.am | |
| parent | 7caef9a314fc9f1fea996d79601d4242286825b1 (diff) | |
| parent | f27253b155db8d3c06bf13801c63bdc282da4157 (diff) | |
| download | mate-system-monitor-684e6bb4c072f707a92ce72d85954b5790aaab53.tar.bz2 mate-system-monitor-684e6bb4c072f707a92ce72d85954b5790aaab53.tar.xz | |
Merge pull request #10 from NiceandGently/master
port to gsettings
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fb22e4b..6d982b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,10 +30,10 @@ mate_system_monitor_SOURCES = \ sysinfo.cpp sysinfo.h \ lsof.cpp lsof.h \ selection.cpp selection.h \ - mateconf-keys.cpp mateconf-keys.h \ + settings-keys.cpp settings-keys.h \ iconthemewrapper.cpp iconthemewrapper.h \ e_date.c e_date.h \ - gsm_color_button.c gsm_color_button.h + gsm_color_button.c gsm_color_button.h mate_system_monitor_LDADD = @PROCMAN_LIBS@ libbacon.la @@ -47,25 +47,20 @@ libbacon_la_SOURCES = \ specdir = $(datadir)/procman -schemadir = $(MATECONF_SCHEMA_FILE_DIR) -schema_ins = mate-system-monitor.schemas.in -schema_DATA = $(schema_ins:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ -EXTRA_DIST = \ - $(schema_ins) +# GSettings schemas, enum files and conversion file +gsettings_ENUM_NAMESPACE = org.mate.mate-system-monitor +gsettings_ENUM_FILES = $(top_srcdir)/src/*.h +gsettingsschemadir = $(datadir)/glib-2.0/schemas +gsettings_in_file = org.mate.mate-system-monitor.gschema.xml.in +gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ + +dist_noinst_DATA = \ + $(gsettings_in_file) CLEANFILES = \ - $(schema_DATA) + $(gsettings_SCHEMAS) -if MATECONF_SCHEMAS_INSTALL -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 $(top_builddir)/src/$$p; \ - done; \ - fi -else -install-data-local: -endif +MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid) |