1 files changed, 8 insertions, 21 deletions
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index b5ccdfbc..55a2dddc 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -26,7 +26,7 @@ WNCKLET_SOURCES = \
 showdesktop.h
 
 WNCKLET_LDADD = \
- ../../libmate-panel-applet/libmate-panel-applet-3.la \
+ ../../libmate-panel-applet/libmate-panel-applet-4.la \
 $(WNCKLET_LIBS) \
 $(LIBMATE_PANEL_APPLET_LIBS)
 
@@ -84,32 +84,19 @@ xmlui_DATA = \
 showdesktop-menu.xml \
 window-list-menu.xml
 
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = workspace-switcher.schemas.in window-list.schemas.in
-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)/applets/wncklet/$$p ; \
- done \
- fi
-uninstall-local:
- for p in $(schema_DATA) ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/wncklet/$$p ; \
- done
-endif
+gsettings_SCHEMAS = \
+ org.mate.panel.applet.window-list.gschema.xml \
+ org.mate.panel.applet.workspace-switcher.gschema.xml
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
 EXTRA_DIST = \
 org.mate.panel.Wncklet.mate-panel-applet.in.in \
 $(service_in_files) \
 $(xmlui_DATA) \
- $(schemas_in_files) \
+ $(gsettings_SCHEMAS) \
 $(ui_DATA)
 
-CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 -include $(top_srcdir)/git.mk