[LyX/master] Fix distcheck target

[Jean-Marc Lasgouttes]

Le 26/01/2020 à 20:14, Jean-Marc Lasgouttes a écrit :
> commit 9017581ecf26c5e651ee1bccc053285a1b21ca29
> Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
> Date:   Sun Jan 26 19:46:19 2020 +0100
> 
>      Fix distcheck target
>      
>      1/ The most annoying part was the error in po/. It turns out that reading
>      and understanding the po/Makevars file was the key. A simple change of
>      variable ensures that "make dist" does not try to rebuild lyx.pot.
>      
>      2/ The way tests in src/ are defined meant that the
>      dependency-tracking files were not all deleted. This should be OK now.

On the fourth time I looked at this issue, I finally nailed it. Yay!

Riki, this is candidate for branch, but probably after 2.3.5 (unless you 
want it right now).

JMarc


> ---
>   po/Makevars     |    2 +-
>   src/Makefile.am |   28 ++++++++++++++--------------
>   2 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/po/Makevars b/po/Makevars
> index 918124f..80330d6 100644
> --- a/po/Makevars
> +++ b/po/Makevars
> @@ -75,4 +75,4 @@ PO_DEPENDS_ON_POT = yes
>   # regenerate PO files on "make dist".  Possible values are "yes" and
>   # "no".  Set this to no if the POT file and PO files are maintained
>   # externally.
> -DIST_DEPENDS_ON_UPDATE_PO = yes
> +DIST_DEPENDS_ON_UPDATE_PO = no
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 15a3dfa..5a9ba93 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -705,7 +705,9 @@ check_layout_CPPFLAGS = $(AM_CPPFLAGS)
>   check_layout_LDADD = $(check_layout_LYX_OBJS) $(TESTS_LIBS)
>   check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
>   check_layout_SOURCES = \
> -	tests/check_layout.cpp
> +	tests/check_layout.cpp \
> +	tests/dummy_functions.cpp \
> +	tests/boost.cpp
>   check_layout_LYX_OBJS = \
>   	insets/InsetLayout.o \
>   	CiteEnginesList.o \
> @@ -719,18 +721,16 @@ check_layout_LYX_OBJS = \
>   	Lexer.o \
>   	ModuleList.o \
>   	Spacing.o \
> -	TextClass.o \
> -	tests/dummy_functions.o \
> -	tests/boost.o
> +	TextClass.o
>   
>   check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
>   check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS)
>   check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
>   check_ExternalTransforms_SOURCES = \
> -	tests/check_ExternalTransforms.cpp
> +	tests/check_ExternalTransforms.cpp \
> +	tests/dummy_functions.cpp \
> +	tests/boost.cpp
>   check_ExternalTransforms_LYX_OBJS = \
> -	tests/dummy_functions.o \
> -	tests/boost.o \
>   	graphics/GraphicsParams.o \
>   	insets/ExternalTransforms.o \
>   	Length.o \
> @@ -740,10 +740,10 @@ check_Length_CPPFLAGS = $(AM_CPPFLAGS)
>   check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS)
>   check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
>   check_Length_SOURCES = \
> -	tests/check_Length.cpp
> +	tests/check_Length.cpp \
> +	tests/dummy_functions.cpp \
> +	tests/boost.cpp
>   check_Length_LYX_OBJS = \
> -	tests/dummy_functions.o \
> -	tests/boost.o \
>   	Length.o \
>   	lengthcommon.o
>   
> @@ -751,9 +751,9 @@ check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
>   check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)
>   check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
>   check_ListingsCaption_SOURCES = \
> -	tests/check_ListingsCaption.cpp
> -check_ListingsCaption_LYX_OBJS = \
> -	tests/dummy_functions.o \
> -	tests/boost.o
> +	tests/check_ListingsCaption.cpp \
> +	tests/dummy_functions.cpp \
> +	tests/boost.cpp
> +check_ListingsCaption_LYX_OBJS =
>   
>   .PHONY: alltests alltests-recursive updatetests
>