X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=5bf8f3bd5e3f19f4c0c18b208fc4a5327425f3a4;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=4cb38b5736618fd06b5b68e977785015f2d0fa28;hpb=ff8fe6aaf87882f629a8865fc02f55001f427605;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 4cb38b5736..5bf8f3bd5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/config/common.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/src
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
-AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
+AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) $(MYTHES_INCLUDES)
 AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -134,7 +134,6 @@ SOURCEFILESCORE = \
 	FuncRequest.cpp \
 	FuncStatus.cpp \
 	Graph.cpp \
-	HSpace.cpp \
 	IndicesList.cpp \
 	InsetIterator.cpp \
 	InsetList.cpp \
@@ -184,6 +183,7 @@ SOURCEFILESCORE = \
 	TextClass.cpp \
 	TextMetrics.cpp \
 	TocBackend.cpp \
+	TocBuilder.cpp \
 	Trans.cpp \
 	Undo.cpp \
 	VCBackend.cpp \
@@ -236,7 +236,6 @@ HEADERFILESCORE = \
 	FuncRequest.h \
 	FuncStatus.h \
 	Graph.h \
-	HSpace.h \
 	IndicesList.h \
 	InsetIterator.h \
 	InsetList.h \
@@ -290,6 +289,7 @@ HEADERFILESCORE = \
 	TextMetrics.h \
 	Toc.h \
 	TocBackend.h \
+	TocBuilder.h \
 	Trans.h \
 	Undo.h \
 	update_flags.h \
@@ -703,13 +703,16 @@ endif
 EXTRA_DIST += \
 	tests/test_ExternalTransforms \
 	tests/test_ListingsCaption \
+	tests/test_layout \
+	tests/test_Length \
 	tests/regfiles/ExternalTransforms \
 	tests/regfiles/Length \
 	tests/regfiles/ListingsCaption \
-	tests/test_layout \
-	tests/test_Length
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
 
-TESTS = tests/test_ExternalTransforms tests/test_Length tests/test_ListingsCaption
+TESTS = tests/test_ExternalTransforms tests/test_ListingsCaption \
+	tests/test_layout tests/test_Length
 
 alltests: check alltests-recursive
 
@@ -735,58 +738,63 @@ if INSTALL_MACOSX
 ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
 endif
 
-check_layout_CPPFLAGS = $(AM_CPPFLAGS)
-check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
+TESTS_LIBS = support/liblyxsupport.a \
+	$(LIBICONV) $(BOOST_LIBS) @LIBS@ \
 	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+
+check_layout_CPPFLAGS = $(AM_CPPFLAGS)
+check_layout_LDADD = $(check_layout_LYX_OBJS) $(TESTS_LIBS)
 check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_layout_SOURCES = \
-	insets/InsetLayout.cpp \
-	Color.cpp \
-	Counters.cpp \
-	Floating.cpp \
-	FloatList.cpp \
-	FontInfo.cpp \
-	Layout.cpp \
-	LayoutFile.cpp \
-	Lexer.cpp \
-	ModuleList.cpp \
-	Spacing.cpp \
-	TextClass.cpp \
-	support/tests/dummy_functions.cpp \
-	tests/check_layout.cpp \
-	tests/boost.cpp
+	tests/check_layout.cpp
+check_layout_LYX_OBJS = \
+	insets/InsetLayout.o \
+	CiteEnginesList.o \
+	Color.o \
+	Counters.o \
+	Floating.o \
+	FloatList.o \
+	FontInfo.o \
+	Layout.o \
+	LayoutFile.o \
+	Lexer.o \
+	ModuleList.o \
+	Spacing.o \
+	TextClass.o \
+	tests/dummy_functions.o \
+	tests/boost.o
 
 check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
-check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
-	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS)
 check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_ExternalTransforms_SOURCES = \
-	graphics/GraphicsParams.cpp \
-	insets/ExternalTransforms.cpp \
-	Length.cpp \
-	lengthcommon.cpp \
-	support/tests/dummy_functions.cpp \
-	tests/check_ExternalTransforms.cpp \
-	tests/boost.cpp
+	tests/check_ExternalTransforms.cpp
+check_ExternalTransforms_LYX_OBJS = \
+	tests/dummy_functions.o \
+	tests/boost.o \
+	graphics/GraphicsParams.o \
+	insets/ExternalTransforms.o \
+	Length.o \
+	lengthcommon.o
 
 check_Length_CPPFLAGS = $(AM_CPPFLAGS)
-check_Length_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
-	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS)
 check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_Length_SOURCES = \
-	Length.cpp \
-	lengthcommon.cpp \
-	support/tests/dummy_functions.cpp \
-	tests/check_Length.cpp \
-	tests/boost.cpp
+	tests/check_Length.cpp
+check_Length_LYX_OBJS = \
+	tests/dummy_functions.o \
+	tests/boost.o \
+	Length.o \
+	lengthcommon.o
 
 check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
-check_ListingsCaption_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
-	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)
 check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_ListingsCaption_SOURCES = \
-	support/tests/dummy_functions.cpp \
-	tests/check_ListingsCaption.cpp \
-	tests/boost.cpp
+	tests/check_ListingsCaption.cpp
+check_ListingsCaption_LYX_OBJS = \
+	tests/dummy_functions.o \
+	tests/boost.o
 
 .PHONY: alltests alltests-recursive updatetests