From b91dbe12e8f334e7fbaf9a36814d36d63c94dfd4 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Wed, 25 Dec 2019 17:58:28 +0800
Subject: migrate from intltools to gettext

---
 battstat/Makefile.am | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'battstat/Makefile.am')

diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index cc3e09c3..884252e3 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -58,14 +58,13 @@ battstat_applet_LDADD = \
 			 $(UPOWER_LIBS) \
 			 -lm
 
-@INTLTOOL_XML_NOMERGE_RULE@
 batstat_gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in
 gsettings_SCHEMAS = $(batstat_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.BattstatApplet.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 \
@@ -73,7 +72,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.BattstatAppletFactory.service.in
@@ -84,7 +84,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 uidir = $(datadir)/mate/ui
 ui_DATA = battstat-applet-menu.xml
@@ -92,7 +92,7 @@ ui_DATA = battstat-applet-menu.xml
 EXTRA_DIST = 							\
 	$(builder_DATA)						\
 	$(ui_DATA)						\
-	org.mate.applets.BattstatApplet.mate-panel-applet.in.in	\
+	$(applet_in_files).in	\
 	$(service_in_files)					\
 	$(batstat_gschema_in_files)
 
-- 
cgit v1.2.1