1 files changed, 21 insertions, 25 deletions
diff --git a/mate-screenshot/Makefile.am b/mate-screenshot/Makefile.am
index d83f5869..66de5dd0 100644
--- a/mate-screenshot/Makefile.am
+++ b/mate-screenshot/Makefile.am
@@ -5,9 +5,6 @@ INCLUDES = \
 -I$(srcdir) \
 -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 -DUIDIR=\""$(uidir)"\" \
- $(MATE_UTILS_CFLAGS) \
- $(LIBCANBERRA_GTK_CFLAGS) \
- $(GTHREAD_CFLAGS) \
 $(NULL)
 
 bin_PROGRAMS = \
@@ -28,13 +25,23 @@ mate_screenshot_SOURCES = \
 screenshot-xfer.h \
 $(NULL)
 
+mate_screenshot_CFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(LIBCANBERRA_GTK_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(NULL)
+
 mate_screenshot_LDFLAGS = -export-dynamic
 
 mate_screenshot_LDADD = \
 $(XSHAPE_LIBS) \
- $(MATE_UTILS_LIBS) \
+ $(GLIB_LIBS) \
+ $(GIO_LIBS) \
 $(LIBCANBERRA_GTK_LIBS) \
 $(GTHREAD_LIBS) \
+ $(GTK_LIBS) \
 -lm \
 $(NULL)
 
@@ -50,35 +57,24 @@ ui_DATA = \
 mate-screenshot.ui \
 $(NULL)
 
+gsettingsschema_in_files = org.mate.screenshot.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+.PRECIOUS: $(gsettings_SCHEMAS)
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
 EXTRA_DIST = \
- $(schemas_in_files) \
+ $(gsettingsschema_in_files) \
 $(mate_screenshot_in_files) \
 $(man_MANS) \
 $(ui_DATA) \
 $(NULL)
 
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = \
- mate-screenshot.schemas.in \
- $(NULL)
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/mate-screenshot/$$p ; \
- done ; \
- fi
-else
-install-data-local:
-endif
-
 CLEANFILES = \
 $(BUILT_SOURCES) \
- $(schemas_in_files:.schemas.in=.schemas) \
+ $(gsettings_SCHEMAS) \
 $(mate_screenshot_DATA) \
 $(sys_DATA)