diff options
author | Daiki Ueno <ueno@gnu.org> | 2014-12-04 11:59:53 +0900 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2014-12-04 12:00:36 +0900 |
commit | d2d04ba9070867f41788c858bf4d3c31f831dce0 (patch) | |
tree | f47e2036327ad6a82985d4aa105a84aa1a786acc /gettext-runtime | |
parent | f31999248a85673604f02341c076c3ae8bfbd14b (diff) | |
download | external_gettext-d2d04ba9070867f41788c858bf4d3c31f831dce0.zip external_gettext-d2d04ba9070867f41788c858bf4d3c31f831dce0.tar.gz external_gettext-d2d04ba9070867f41788c858bf4d3c31f831dce0.tar.bz2 |
intl: Make the LCOV workaround non-intrusive
* gettext-runtime/intl/Makefile.in (PLURAL_OBJECT): New variable.
(OBJECTS): Refer to $(PLURAL_OBJECT) instead of plural.$lo.
(pluralx.c, pluralx.lo): New rule.
(mostlyclean): Remove pluralx.c.
* gettext-tools/configure.ac: Replace PLURAL_OBJECT in intl/Makefile.
Diffstat (limited to 'gettext-runtime')
-rw-r--r-- | gettext-runtime/intl/ChangeLog | 8 | ||||
-rw-r--r-- | gettext-runtime/intl/Makefile.in | 22 |
2 files changed, 22 insertions, 8 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index d4cc23b..6a4517e 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,11 @@ +2014-12-04 Daiki Ueno <ueno@gnu.org> + + intl: Make the LCOV workaround non-intrusive + * Makefile.in (PLURAL_OBJECT): New variable. + (OBJECTS): Refer to $(PLURAL_OBJECT) instead of plural.$lo. + (pluralx.c, pluralx.lo): New rule. + (mostlyclean): Remove pluralx.c. + 2014-12-03 Daiki Ueno <ueno@gnu.org> intl: Work around LCOV relative base directory resolution diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in index 836a867..d18a99f 100644 --- a/gettext-runtime/intl/Makefile.in +++ b/gettext-runtime/intl/Makefile.in @@ -112,6 +112,10 @@ LIBS = @LIBS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) +# This line will be replaced with pluralx.$lo, when this file is used +# in gettext-tools/intl/. See the pluralx.lo rule below for the rationale. +PLURAL_OBJECT = plural.$lo + HEADERS = \ gmo.h \ gettextP.h \ @@ -179,7 +183,7 @@ OBJECTS = \ dcngettext.$lo \ dngettext.$lo \ ngettext.$lo \ - plural.$lo \ + $(PLURAL_OBJECT) \ plural-exp.$lo \ localcharset.$lo \ threadlib.$lo \ @@ -277,13 +281,15 @@ dngettext.lo: $(srcdir)/dngettext.c $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dngettext.c ngettext.lo: $(srcdir)/ngettext.c $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/ngettext.c +plural.lo: $(srcdir)/plural.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/plural.c # $(srcdir)/plural.c contains a relative file name of the Bison source. -# That could mess up gcov when the C source file is referred to from a +# That could mess up LCOV when the C source file is referred to from a # different base directory. -plural.lo: $(srcdir)/plural.c - $(AM_V_GEN)test "$(srcdir)" = . || \ - sed -e 's|^#line \([0-9]*\) "\(plural\.[cy]\)"|#line \1 "$(srcdir)/\2"|' < $(srcdir)/plural.c > plural.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) plural.c +pluralx.c: $(srcdir)/plural.c + $(AM_V_GEN)sed -e 's|^#line \([0-9]*\) "\(plural\.[cy]\)"|#line \1 "$(srcdir)/\2"|' < $(srcdir)/plural.c > $@ +pluralx.lo: pluralx.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) pluralx.c plural-exp.lo: $(srcdir)/plural-exp.c $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/plural-exp.c localcharset.lo: $(srcdir)/localcharset.c @@ -589,7 +595,7 @@ bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngette localename.$lo: $(srcdir)/gettextP.h hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h -dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h +dcigettext.$lo loadmsgcat.$lo $(PLURAL_OBJECT) plural-exp.$lo: $(srcdir)/plural-exp.h dcigettext.$lo: $(srcdir)/eval-plural.h localcharset.$lo: $(srcdir)/localcharset.h bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h @@ -621,7 +627,7 @@ mostlyclean: rm -f *.a *.la *.o *.obj *.lo core core.* rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed rm -f -r .libs _libs - test "$(srcdir)" = . || rm -f plural.c + rm -f pluralx.c clean: mostlyclean |