summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorMarcel Dijkstra <[email protected]>2013-01-17 20:51:56 +0100
committerStefano Karapetsas <[email protected]>2013-01-17 20:55:23 +0100
commit46c4c36e0aa6244b292e647061d90c3ab6312f90 (patch)
tree77778b8e5fbf75baf1603261797b08937d9b9955 /src/Makefile.am
parent7d6b297873d9ccd0117d2d508d642d479295582b (diff)
downloadmate-terminal-46c4c36e0aa6244b292e647061d90c3ab6312f90.tar.bz2
mate-terminal-46c4c36e0aa6244b292e647061d90c3ab6312f90.tar.xz
Migrate to GSettings
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index cdada83..65c26a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,10 +23,14 @@ mate_terminal_SOURCES= \
terminal-accels.h \
terminal-app.c \
terminal-app.h \
+ terminal-dconf.c \
+ terminal-dconf.h \
terminal-debug.c \
terminal-debug.h \
terminal-encoding.c \
terminal-encoding.h \
+ terminal-gsettings.c \
+ terminal-gsettings.h \
terminal-info-bar.c \
terminal-info-bar.h \
terminal-intl.h \
@@ -76,17 +80,20 @@ mate_terminal_CPPFLAGS = \
-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_SINGLE_INCLUDES \
$(DISABLE_DEPRECATED) \
+ $(DCONF_CFLAGS) \
$(AM_CPPFLAGS)
mate_terminal_CFLAGS = \
$(TERM_CFLAGS) \
$(WARN_CFLAGS) \
+ $(DCONF_CFLAGS) \
$(AM_CFLAGS)
mate_terminal_LDFLAGS = -lICE
mate_terminal_LDADD = \
skey/libskey.la \
+ $(DCONF_LIBS) \
$(TERM_LIBS)
if WITH_SMCLIENT
@@ -147,9 +154,10 @@ terminal-marshal.c: $(srcdir)/terminal-marshal.list
&& mv terminal-marshal.c.tmp terminal-marshal.c ) \
|| ( rm -f terminal-marshal.c.tmp && exit 1 )
-schemadir = $(MATECONF_SCHEMA_FILE_DIR)
-schema_in_files = mate-terminal.schemas.in
-schema_DATA = mate-terminal.schemas
+gsettingsschema_in_files = org.mate.terminal.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+.PRECIOUS: $(gsettings_SCHEMAS)
+@INTLTOOL_XML_NOMERGE_RULE@
aboutdir = $(pkgdatadir)
about_DATA = \
@@ -177,6 +185,7 @@ builder_DATA = $(builder_in_files:.glade=.ui)
CLEANFILES = \
stamp-terminal-type-builtins.h \
mate-terminal.schemas \
+ $(gsettings_SCHEMAS) \
stamp-terminal-type-builtins.h \
$(builder_DATA) \
$(BUILT_SOURCES)
@@ -188,16 +197,14 @@ EXTRA_DIST = \
extra-strings.c \
$(about_DATA) \
$(schema_in_files) \
+ $(gsettingsschema_in_files) \
$(uimanager_DATA) \
$(builder_in_files) \
$(NULL)
-@INTLTOOL_SCHEMAS_RULE@
+@GSETTINGS_RULES@
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/src/$(schema_DATA)
-endif
+@INTLTOOL_SCHEMAS_RULE@
%.ui: %.glade
$(AM_V_GEN) $(GTK_BUILDER_CONVERT) $< $@