diff options
Diffstat (limited to 'applets/fish/Makefile.am')
| -rw-r--r-- | applets/fish/Makefile.am | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am index 95433a87..d25c5eb0 100644 --- a/applets/fish/Makefile.am +++ b/applets/fish/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = $(WARN_CFLAGS) FISH_SOURCES = fish.c FISH_LDADD = \ - ../../libmate-panel-applet/libmate-panel-applet-3.la \ + ../../libmate-panel-applet/libmate-panel-applet-4.la \ $(FISH_LIBS) \ $(LIBMATE_PANEL_APPLET_LIBS) @@ -77,34 +77,19 @@ ui_DATA = fish.ui xmluidir = $(datadir)/mate-panel/ui xmlui_DATA = fish-menu.xml -schemasdir = $(MATECONF_SCHEMA_FILE_DIR) -schemas_in_files = fish.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/fish/$$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/fish/$$p ; \ - done -endif +gsettings_SCHEMAS = org.mate.panel.applet.fish.gschema.xml +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ EXTRA_DIST = \ wanda.svg \ $(fishbitmaps_DATA) \ org.mate.panel.FishApplet.mate-panel-applet.in.in \ $(service_in_files) \ - fish.schemas.in \ $(ui_DATA) \ - $(xmlui_DATA) + $(xmlui_DATA) \ + $(gsettings_SCHEMAS) -CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA) +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) -include $(top_srcdir)/git.mk |