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.

(cherry picked from commit 9017581ecf26c5e651ee1bccc053285a1b21ca29)

diff --git a/po/Makevars b/po/Makevars
index 918124f12996ba0c2d7ebf4569e65286693807a7..80330d6ab5091769aa47582b56b86dbc194be770 100644 (file)
--- 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 99155a6549b720c4c030b06201119aa9c0b3c33b..1fd0fef6dcadbd4579bfb3b91a50d2ede6b62b8d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -747,7 +747,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 \
@@ -761,18 +763,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 \
@@ -782,10 +782,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
 
@@ -793,9 +793,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

diff --git a/status.23x b/status.23x
index 784051ac5a05ebb7bd4cecd192946773101e600d..d41aee914c2e58b707d578404069880792244209 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -212,4 +212,5 @@ What's new
 - Fix configuration bug on Windows which prevented LyX from 
   installing (bug 12369).
 
-
+- With autoconf, fix the "distcheck" make target.
+: