From: Nick Bowler <nbowler@elliptictech.com>
Date: Thu, 29 Sep 2011 13:44:36 +0000 (-0400)
Subject: Generate gettext catalog only from source files.
X-Git-Tag: v1~89
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/560602a3f859d6f00a5dafe4bd6b89517dded916

Generate gettext catalog only from source files.

Otherwise the catalog is considered out of date even from a freshly
unpacked tarball.
---

diff --git a/Makefile.am b/Makefile.am
index 638b071..0632878 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,9 +48,6 @@ cdecl99_SOURCES = src/cdecl99.c
 cdecl99_LDADD = libcdecl.la libgnu.la $(LTLIBINTL) $(LTLIBREADLINE)
 $(cdecl99_OBJECTS): $(gnulib_headers)
 
-# Sources that may contain translatable strings.
-POTSOURCES = $(SOURCES) src/errtab.h
-
 src/parse.lo: src/scan.h
 src/scan.lo: src/parse.h
 src/parse-decl.lo: src/scan.h src/parse.h
@@ -82,9 +79,12 @@ XGETTEXT_OPTS = -D $(builddir) -D $(srcdir) --from-code=utf-8 \
 	--msgid-bugs-address=$(PACKAGE_BUGREPORT) \
 	--keyword=_ --keyword=N_
 
-po/$(PACKAGE).pot: $(POTSOURCES)
-	$(AM_V_at)$(MKDIR_P) $(@D)
-	$(AM_V_GEN)$(XGETTEXT) $(XGETTEXT_OPTS) -o $@ $(POTSOURCES)
+po/$(PACKAGE).pot: $(SOURCES) src/errors.lst
+	$(AM_V_at)  $(MKDIR_P) $(@D)
+	$(AM_V_GEN) $(XGETTEXT) $(XGETTEXT_OPTS) -o $@.tmp $(SOURCES)
+	$(AM_V_at)  $(XGETTEXT) $(XGETTEXT_OPTS) --omit-header -Lc \
+		-ajo $@.tmp src/errors.lst
+	$(AM_V_at)  mv -f $@.tmp $@
 
 .po.mo:
 	$(AM_V_at)$(MKDIR_P) $(@D)