############################### Core ##############################
AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
+AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
if BUILD_CLIENT_SUBDIR
CLIENT = client
liblyxgraphics.a \
support/liblyxsupport.a \
$(OTHERLIBS) \
- $(QT4_LDFLAGS) \
- $(QT4_LIB)
+ $(QT_LDFLAGS) \
+ $(QT_LIB)
if LYX_WIN_RESOURCE
.rc.o:
DepTable.cpp \
DocIterator.cpp \
Encoding.cpp \
+ BufferEncodings.cpp \
ErrorList.cpp \
Exporter.cpp \
factory.cpp \
ParIterator.cpp \
PDFOptions.cpp \
Row.cpp \
- rowpainter.cpp \
+ RowPainter.cpp \
Server.cpp \
ServerSocket.cpp \
sgml.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 \
ParIterator.h \
PDFOptions.h \
Row.h \
- rowpainter.h \
+ RowPainter.h \
Server.h \
ServerSocket.h \
Session.h \
Spacing.h \
SpellChecker.h \
TexRow.h \
- TexStream.h \
Text.h \
TextClass.h \
TextMetrics.h \
CLEANFILES += $(MOCEDFILES)
moc_%.cpp: %.h
- $(MOC4) $(MOCFLAG) -o $@ $<
+ $(QT_MOC) $(MOCFLAG) -o $@ $<
liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
insets/InsetQuotes.cpp \
insets/InsetRef.cpp \
insets/InsetScript.cpp \
+ insets/InsetSeparator.cpp \
insets/InsetSpace.cpp \
insets/InsetSpecialChar.cpp \
insets/InsetTabular.cpp \
insets/InsetQuotes.h \
insets/InsetRef.h \
insets/InsetScript.h \
+ insets/InsetSeparator.h \
insets/InsetSpace.h \
insets/InsetSpecialChar.h \
insets/InsetTabular.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 $(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
-check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS)
+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@ $(QT_CORE_LIBS) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT_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