changes... read the changelog...

[lyx.git] / po / Makefile.in.in

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ff8f18662e566744dd1b53f7de86a3e88c2d5f7a..6974cbd0e9c480555a8199ad6106885e1fb87383 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -49,7 +49,7 @@ GMOFILES = @GMOFILES@
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
 stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
 
-POTFILE_IN_DEPS := $(shell find $(top_srcdir)/src -name Makefile.am)
+POTFILE_IN_DEPS = $(shell find $(top_srcdir)/src -name Makefile.am)
 
 POTFILES = \
 
@@ -109,13 +109,6 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
        fi
        cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
 
-$(top_srcdir)/src/ext_l10n.h: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc $(top_srcdir)/lib/ui/default.ui $(top_srcdir)/lib/languages
-       grep -i -E "submenu|item|optitem" < $(top_srcdir)/lib/ui/default.ui | cut -d '"' -f 2 | \
-               awk '{printf "_(\"%s\");\n", $$0}' > $@
-       cat $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc | grep -i -E "[ ]*style .+$$" | \
-               cut -d ' ' -f 2 | sort | uniq | awk '{printf "_(\"%s\");\n", $$0}' >> $@
-       awk -F '"' '$$2 {printf "_(\"%s\");\n", $$2}' < $(top_srcdir)/lib/languages >> $@
-
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
@@ -236,13 +229,13 @@ update-po: Makefile
          fi; \
        done
 
-${srcdir}/POTFILES.in: $(top_srcdir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
+${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
        rm -f $@-t \
        && ( cd $(top_srcdir); \
-            grep -l -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
-            awk 'BEGIN {FS= ":"} {print $$1}' | \
+            grep -l "_(\".*\")" `find src -name \*.[hHC]` | \
             sed -e '/xforms.forms/d' | \
             sort -f -d | uniq ) > $@-t \
+       && echo "src/ext_l10n.h" >> $@-t \
        && mv $@-t $@
 
 POTFILES: POTFILES.in
@@ -264,6 +257,16 @@ Makefile: Makefile.in.in ../config.status POTFILES
          && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
               $(SHELL) ./config.status
 
+$(top_srcdir)/src/ext_l10n.h: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc $(top_srcdir)/lib/ui/default.ui $(top_srcdir)/lib/languages
+       sed < $(top_srcdir)/lib/ui/default.ui -n \
+               -e 's/.*[sS]ub[mM]enu[^"]*\("[^"]*"\).*/_(\1);/p' \
+               -e 's/.*[iI]tem[^"]*\("[^"]*"\).*/_(\1);/p' \
+               > $@
+       cat $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc | \
+               sed -n -e 's/^[sS]tyle[ ]*\([^ ]*\)$$/_("\1");/p' | \
+               sort | uniq >> $@
+       sed < $(top_srcdir)/lib/languages -e '/^#/d' -e 's/[^"]*\("[A-Za-z0-9][^"]*"\).*/_(\1);/' >> $@
+
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: