diff options
Diffstat (limited to 'charpick/Makefile.am')
| -rw-r--r-- | charpick/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am index d1c6abda..ee1728cd 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -20,8 +20,8 @@ mate_charpick_applet_LDADD = \ $(GUCHARMAP_LIBS) appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in +applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ @@ -29,7 +29,8 @@ $(applet_in_files): $(applet_in_files).in Makefile -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ -%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache +$(applet_DATA): $(applet_in_files) Makefile + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ servicedir = $(datadir)/dbus-1/services service_in_files = org.mate.panel.applet.CharpickerAppletFactory.service.in @@ -40,7 +41,6 @@ org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -@INTLTOOL_XML_NOMERGE_RULE@ charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @@ -48,10 +48,10 @@ gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) uidir = $(datadir)/mate/ui ui_DATA = charpick-applet-menu.xml -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid EXTRA_DIST = \ - org.mate.applets.CharpickerApplet.mate-panel-applet.in.in \ + $(applet_in_files).in \ $(service_in_files) \ $(ui_DATA) \ $(charpick_gschema_in_files) |