From f0a669014f952c8289da6279841cab10f0c3d6c7 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Wed, 4 May 2011 18:51:15 +0000 Subject: [PATCH] Exclude generated files from .po string extraction. Now it is no longer needed to use a tree that was never used for building for remerging .po files. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38585 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/Rules-lyx | 3 ++- src/frontends/qt4/Makefile.am | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/po/Rules-lyx b/po/Rules-lyx index 8aefa41eb2..22fdb26491 100644 --- a/po/Rules-lyx +++ b/po/Rules-lyx @@ -7,11 +7,12 @@ POTFILE_IN_DEPS = $(shell find $(top_srcdir)/src -name Makefile.am) $(DOMAIN).pot-update: l10n_pots +# The ui_*.h and moc_*.cpp filters must match the patterns in src/frontends/qt4/Makefile.am ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS) LC_ALL=C ; export LC_ALL ; \ rm -f $@-t \ && ( cd $(top_srcdir); \ - grep -l "_(\".*\")" `find src \( -name '*.h' -o -name '*.cpp' -o -name '*.cpp.in' \) -print` |\ + grep -l "_(\".*\")" `find src \( \( -name '*.h' -a ! -name 'ui_*.h' \) -o \( -name '*.cpp' -a ! -name 'moc_*.cpp' \) \) -print` |\ grep -v -e "src/support/Package.cpp$$" |\ sort | uniq ) > $@-t \ && mv $@-t $@ diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index caa41159ae..299e3ca9e7 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -10,11 +10,13 @@ CLEANFILES += $(BUILT_SOURCES) # Use _() for localization instead of tr() or trUtf8() UIC4FLAGS=-tr lyx::qt_ +# The ui_%.h pattern must match the filter in ../../../po/Rules-lyx ui_%.h: ui/%.ui $(AM_V_GEN)$(UIC4) $(UIC4FLAGS) $< -o $@ MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp) +# The moc_%.cpp pattern must match the filter in ../../../po/Rules-lyx moc_%.cpp: %.h $(AM_V_GEN)$(MOC4) -o $@ $<