mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
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.
This commit is contained in:
parent
fe4ba565f6
commit
9017581ecf
@ -75,4 +75,4 @@ PO_DEPENDS_ON_POT = yes
|
|||||||
# regenerate PO files on "make dist". Possible values are "yes" and
|
# 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
|
# "no". Set this to no if the POT file and PO files are maintained
|
||||||
# externally.
|
# externally.
|
||||||
DIST_DEPENDS_ON_UPDATE_PO = yes
|
DIST_DEPENDS_ON_UPDATE_PO = no
|
||||||
|
@ -705,7 +705,9 @@ check_layout_CPPFLAGS = $(AM_CPPFLAGS)
|
|||||||
check_layout_LDADD = $(check_layout_LYX_OBJS) $(TESTS_LIBS)
|
check_layout_LDADD = $(check_layout_LYX_OBJS) $(TESTS_LIBS)
|
||||||
check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_layout_SOURCES = \
|
check_layout_SOURCES = \
|
||||||
tests/check_layout.cpp
|
tests/check_layout.cpp \
|
||||||
|
tests/dummy_functions.cpp \
|
||||||
|
tests/boost.cpp
|
||||||
check_layout_LYX_OBJS = \
|
check_layout_LYX_OBJS = \
|
||||||
insets/InsetLayout.o \
|
insets/InsetLayout.o \
|
||||||
CiteEnginesList.o \
|
CiteEnginesList.o \
|
||||||
@ -719,18 +721,16 @@ check_layout_LYX_OBJS = \
|
|||||||
Lexer.o \
|
Lexer.o \
|
||||||
ModuleList.o \
|
ModuleList.o \
|
||||||
Spacing.o \
|
Spacing.o \
|
||||||
TextClass.o \
|
TextClass.o
|
||||||
tests/dummy_functions.o \
|
|
||||||
tests/boost.o
|
|
||||||
|
|
||||||
check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
|
check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
|
||||||
check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS)
|
check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS)
|
||||||
check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_ExternalTransforms_SOURCES = \
|
check_ExternalTransforms_SOURCES = \
|
||||||
tests/check_ExternalTransforms.cpp
|
tests/check_ExternalTransforms.cpp \
|
||||||
|
tests/dummy_functions.cpp \
|
||||||
|
tests/boost.cpp
|
||||||
check_ExternalTransforms_LYX_OBJS = \
|
check_ExternalTransforms_LYX_OBJS = \
|
||||||
tests/dummy_functions.o \
|
|
||||||
tests/boost.o \
|
|
||||||
graphics/GraphicsParams.o \
|
graphics/GraphicsParams.o \
|
||||||
insets/ExternalTransforms.o \
|
insets/ExternalTransforms.o \
|
||||||
Length.o \
|
Length.o \
|
||||||
@ -740,10 +740,10 @@ check_Length_CPPFLAGS = $(AM_CPPFLAGS)
|
|||||||
check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS)
|
check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS)
|
||||||
check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_Length_SOURCES = \
|
check_Length_SOURCES = \
|
||||||
tests/check_Length.cpp
|
tests/check_Length.cpp \
|
||||||
|
tests/dummy_functions.cpp \
|
||||||
|
tests/boost.cpp
|
||||||
check_Length_LYX_OBJS = \
|
check_Length_LYX_OBJS = \
|
||||||
tests/dummy_functions.o \
|
|
||||||
tests/boost.o \
|
|
||||||
Length.o \
|
Length.o \
|
||||||
lengthcommon.o
|
lengthcommon.o
|
||||||
|
|
||||||
@ -751,9 +751,9 @@ check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
|
|||||||
check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)
|
check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)
|
||||||
check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_ListingsCaption_SOURCES = \
|
check_ListingsCaption_SOURCES = \
|
||||||
tests/check_ListingsCaption.cpp
|
tests/check_ListingsCaption.cpp \
|
||||||
check_ListingsCaption_LYX_OBJS = \
|
tests/dummy_functions.cpp \
|
||||||
tests/dummy_functions.o \
|
tests/boost.cpp
|
||||||
tests/boost.o
|
check_ListingsCaption_LYX_OBJS =
|
||||||
|
|
||||||
.PHONY: alltests alltests-recursive updatetests
|
.PHONY: alltests alltests-recursive updatetests
|
||||||
|
Loading…
Reference in New Issue
Block a user