############################### Core ##############################
-DISTCLEANFILES += libintl.h
-
AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
EXTRA_DIST = pch.h
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
- $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
+ @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
noinst_LIBRARIES = liblyxcore.a
bin_PROGRAMS = lyx
DepTable.cpp \
DocIterator.cpp \
Encoding.cpp \
+ BufferEncodings.cpp \
ErrorList.cpp \
Exporter.cpp \
factory.cpp \
Text.cpp \
Text2.cpp \
Text3.cpp \
- TexStream.cpp \
TextClass.cpp \
TextMetrics.cpp \
TocBackend.cpp \
BranchList.h \
buffer_funcs.h \
Buffer.h \
+ BufferEncodings.h \
BufferList.h \
BufferParams.h \
BufferView.h \
Spacing.h \
SpellChecker.h \
TexRow.h \
- TexStream.h \
Text.h \
TextClass.h \
TextMetrics.h \
############################### Mathed ##############################
-EXTRA_DIST += mathed/InsetFormulaMacro.cpp
-
noinst_LIBRARIES += liblyxmathed.a
SOURCEFILESMATHED = \
mathed/MathCompletionList.h \
mathed/MathExtern.h \
mathed/MathFactory.h \
- mathed/MathGridInfo.h \
mathed/MathMacro.h \
mathed/MathMacroArgument.h \
mathed/MacroTable.h \
EXTRA_DIST += \
tests/test_layout
+alltests: check alltests-recursive
-TESTS = \
- tests/test_layout
+alltests-recursive: check_layout
+ @srcdir=$(srcdir) $(srcdir)/tests/test_layout; \
+ if test $$? -eq 0; then \
+ echo -e "====================\nlayout tests passed.\n===================="; \
+ else \
+ echo -e "====================\nlayout tests failed.\n===================="; \
+ fi
+ cd tex2lyx; $(MAKE) alltests-recursive
+
+updatetests:
+ cd tex2lyx; $(MAKE) updatetests
check_PROGRAMS = \
check_layout
-check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
-check_layout_LDADD = support/liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-# need to allow multiple definitions of _() (see dummy_functions.cpp)
-check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition
+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@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_layout_SOURCES = \
insets/InsetLayout.cpp \
Color.cpp \
Spacing.cpp \
TextClass.cpp \
tests/check_layout.cpp \
- support/tests/boost.cpp \
- support/tests/dummy_functions.cpp
+ tests/boost.cpp \
+ tests/dummy_functions.cpp
+.PHONY: alltests alltests-recursive updatetests