diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-24 18:17:36 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-24 18:17:36 +0100 |
| commit | d2d15da67e19e821d051d1b2382885854acd140c (patch) | |
| tree | 21989327fc0e6a8d36e37318de970c7f6e72b6fe /charpick/Makefile.am | |
| parent | 8ea3054c1e05445f990c98db033754cf190d2a7a (diff) | |
| download | mate-applets-d2d15da67e19e821d051d1b2382885854acd140c.tar.bz2 mate-applets-d2d15da67e19e821d051d1b2382885854acd140c.tar.xz | |
charpick: migrate to gsettings
Diffstat (limited to 'charpick/Makefile.am')
| -rw-r--r-- | charpick/Makefile.am | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 40c62338..2597bded 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ -I. \ -I$(srcdir) \ -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \ - $(MATE_APPLETS3_CFLAGS) \ + $(MATE_APPLETS4_CFLAGS) \ $(GUCHARMAP_CFLAGS) libexec_PROGRAMS = charpick_applet2 @@ -14,7 +14,7 @@ charpick_applet2_SOURCES = charpick.c \ properties.c charpick_applet2_LDADD = \ - $(MATE_APPLETS3_LIBS) \ + $(MATE_APPLETS4_LIBS) \ $(GUCHARMAP_LIBS) appletdir = $(datadir)/mate-panel/applets @@ -38,25 +38,22 @@ org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(schemas_DATA) +@INTLTOOL_XML_NOMERGE_RULE@ +gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml +@GSETTINGS_RULES@ -schemasdir = @MATECONF_SCHEMA_FILE_DIR@ -schemas_in_files = charpick.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) +%.gschema.xml.in: %.gschema.xml.in.in Makefile + $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ -@INTLTOOL_SCHEMAS_RULE@ uidir = $(datadir)/mate-2.0/ui ui_DATA = charpick-applet-menu.xml +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid + EXTRA_DIST = \ org.mate.applets.CharpickerApplet.mate-panel-applet.in.in \ $(service_in_files) \ $(ui_DATA) \ - $(schemas_in_files) - -if MATECONF_SCHEMAS_INSTALL -install-data-local: - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schemas_DATA) ; -endif + $(gsettings_SCHEMAS_in_in) -include $(top_srcdir)/git.mk |