X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2Fautomake.mk;h=0b18ef80298d4cba7eeafa5b0413ba06c4840dd4;hb=4f6a8477ebd647fb96747790cc89ec5f26d68a07;hp=56715e1ebdc8c8acb5834e56f28c2b2c893987a9;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git

diff --git a/po/automake.mk b/po/automake.mk
index 56715e1e..0b18ef80 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -10,21 +10,24 @@ POTFILE=po/$(DOMAIN).pot
 
 TRANSLATABLE_FILES = $(DIST_SOURCES) $(all_q_sources)
 
-$(POTFILE): $(TRANSLATABLE_FILES)
-	@$(MKDIR_P) po
-	$(XGETTEXT) --directory=$(top_srcdir) $(TRANSLATABLE_FILES) \
-	$(XGETTEXT_OPTIONS) \
+XGETTEXT_OPTIONS = \
 	--copyright-holder="$(COPYRIGHT_HOLDER)" \
 	--package-name=$(PACKAGE) \
 	--package-version=$(VERSION) \
 	--msgid-bugs-address=$(MSGID_BUGS_ADDRESS) \
-	--add-comments='TRANSLATORS:' \
-	-o $(POTFILE)
+	--add-comments='TRANSLATORS:'
+
+$(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES)
+	@$(MKDIR_P) po
+	$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS)    $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@
+	$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=glade -o $@
 
 
 $(POFILES): $(POTFILE)
-	$(MSGMERGE) $(top_srcdir)/$* $< -o $@
+	$(MSGMERGE) $(top_srcdir)/$@ $? -o $@
+
 
+SUFFIXES += .po .gmo
 .po.gmo:
 	@$(MKDIR_P) `dirname $@`
 	$(MSGFMT) $< -o $@
@@ -39,16 +42,23 @@ install-data-hook: $(GMOFILES)
 	  lang=`echo $$f | sed -e 's%po/\(.*\)\.gmo%\1%' ` ; \
 	  $(INSTALL) -D $$f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
 	done
-	
 
 uninstall-hook:
 	for f in $(GMOFILES); do \
 	  lang=`echo $$f | sed -e 's%po/\(.*\)\.gmo%\1%' ` ; \
-	  $(RM) $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
+	  rm -f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
 	done
 
 
 EXTRA_DIST += $(POFILES) $(POTFILE)
 
-CLEANFILES += $(POFILES) $(GMOFILES) $(POTFILE)
+CLEANFILES += $(GMOFILES) $(POTFILE)
 
+# Clean $(POFILES) from build directory but not if that's the same as
+# the source directory.
+po_CLEAN:
+	@if test "$(srcdir)" != .; then \
+		echo rm -f $(POFILES); \
+		rm -f $(POFILES); \
+	fi
+CLEAN_LOCAL += po_CLEAN