Adjust preprocessor guards for Qt5/X11.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 373c0b074ca47044e1252adb6aee211a22932e60..9b6b5384c69e110bf1ad2441b095db498efa7c2d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,6 +181,7 @@ SOURCEFILESCORE = \
        Session.cpp \
        Spacing.cpp \
        TexRow.cpp \
+       texstream.cpp \
        Text.cpp \
        Text2.cpp \
        Text3.cpp \
@@ -287,6 +288,7 @@ HEADERFILESCORE = \
        Spacing.h \
        SpellChecker.h \
        TexRow.h \
+       texstream.h \
        Text.h \
        TextClass.h \
        TextMetrics.h \
@@ -681,7 +683,11 @@ endif
 ############################## Tests ##################################
 
 EXTRA_DIST += \
-       tests/test_layout CMakeLists.txt
+       tests/test_ExternalTransforms \
+       tests/regfiles/ExternalTransforms \
+       tests/test_layout
+
+TESTS = tests/test_ExternalTransforms
 
 alltests: check alltests-recursive
 
@@ -698,6 +704,7 @@ updatetests:
        cd tex2lyx; $(MAKE) updatetests
 
 check_PROGRAMS = \
+       check_ExternalTransforms \
        check_layout
 
 if INSTALL_MACOSX
@@ -724,4 +731,16 @@ check_layout_SOURCES = \
        tests/boost.cpp \
        tests/dummy_functions.cpp
 
+check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
+check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_CORE_LIBS) $(LIBSHLWAPI)
+check_ExternalTransforms_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_ExternalTransforms_SOURCES = \
+       graphics/GraphicsParams.cpp \
+       insets/ExternalTransforms.cpp \
+       Length.cpp \
+       lengthcommon.cpp \
+       tests/check_ExternalTransforms.cpp \
+       tests/boost.cpp \
+       tests/dummy_functions.cpp
+
 .PHONY: alltests alltests-recursive updatetests