From b23df57cd271ecae89892336eaadcf26b7e9bce8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 2 Jul 2014 00:13:02 -0400
Subject: Generate po/*.pot files

---
 Makefile      | 10 ++++++++--
 common.mk     |  2 +-
 po/.gitignore |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 po/.gitignore

diff --git a/Makefile b/Makefile
index 8b811e6..db4735f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ copy:    PHONY $(addprefix copy-,   $(packages))
 build:   PHONY $(addprefix build-,  $(packages))
 install: PHONY $(addprefix install-,$(packages))
 clean:   PHONY $(addprefix clean-,  $(packages))
+	rm -f po/*.pot
 pot:     PHONY $(addprefix pot-,    $(filter-out doc,$(packages)))
 check:
 	@cd test && ./testenv $(TESTENVFLAGS) roundup
@@ -42,16 +43,21 @@ check:
 	$(MAKE) -C $* clean
 %/pot: PHONY %
 	$(MAKE) -C $* pot
+%/everything.pot: FORCE %
+	$(MAKE) -C $* everything.pot
 
 .SECONDEXPANSION:
 $(addprefix copy-,   $(packages)): copy-%:    PHONY $$(addsuffix /copy,   $$($$*))
 $(addprefix build-,  $(packages)): build-%:   PHONY $$(addsuffix /build,  $$($$*))
 $(addprefix install-,$(packages)): install-%: PHONY $$(addsuffix /install,$$($$*))
 $(addprefix clean-,  $(packages)): clean-%:   PHONY $$(addsuffix /clean,  $$($$*))
-$(addprefix pot-,    $(packages)): pot-%:     PHONY $$(addsuffix /pot,    $$($$*))
+$(addprefix pot-,    $(packages)): pot-%:     PHONY po/%.pot
+$(addprefix pot-,    $(packages)): pot-%:     PHONY po/%.pot
+$(foreach p,$(packages),po/$p.pot): po/%.pot: $$(addsuffix /everything.pot,$$($$*))
+	cat $^ | msguniq -Fi > '$@' || rm -f '$@'
 
 ################################################################################
 
 FORCE: PHONY
 PHONY:
-.PHONY: FORCE PHONY
+.PHONY: PHONY
diff --git a/common.mk b/common.mk
index 0bcc2b8..30c95e0 100644
--- a/common.mk
+++ b/common.mk
@@ -53,7 +53,7 @@ install_files += $(addprefix $(DESTDIR)$(bindir)/,$(progs)) \
                  $(addprefix $(DESTDIR)$(mandir)/man8/,$(filter %.8,$(mans)))
 clean_files += $(patsubst %.in,%,$(copy_files)) $(copy_files) $(mans) $(wildcard *.pot *.ugly*)
 
-pots  += $(filter-out $(no-pots) ,$(progs))
+pots  += $(filter-out $(no-pots) ,$(sort $(progs) $(libexecs) $(libs)))
 pot_files += $(addsuffix .pot,$(pots))
 
 # Set the default target #######################################################
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 0000000..e3a8c5d
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1 @@
+*.pot
-- 
cgit v1.2.2