Revert "Objective-C compililation support with cmake and C++11"

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 024cf45661c6e49dbdf4bac43945de28db9d49bf..d3ea7bc0e4477a8c19669a5a5c8f2d7792f28bdb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,6 +119,7 @@ SOURCEFILESCORE = \
        DepTable.cpp \
        DocIterator.cpp \
        Encoding.cpp \
+       BufferEncodings.cpp \
        ErrorList.cpp \
        Exporter.cpp \
        factory.cpp \
@@ -177,7 +178,6 @@ SOURCEFILESCORE = \
        Text.cpp \
        Text2.cpp \
        Text3.cpp \
-       TexStream.cpp \
        TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
@@ -194,6 +194,7 @@ HEADERFILESCORE = \
        BranchList.h \
        buffer_funcs.h \
        Buffer.h \
+       BufferEncodings.h \
        BufferList.h \
        BufferParams.h \
        BufferView.h \
@@ -280,7 +281,6 @@ HEADERFILESCORE = \
        Spacing.h \
        SpellChecker.h \
        TexRow.h \
-       TexStream.h \
        Text.h \
        TextClass.h \
        TextMetrics.h \
@@ -689,7 +689,7 @@ if INSTALL_MACOSX
 ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
 endif
 
-check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
+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 = \
@@ -706,7 +706,7 @@ check_layout_SOURCES = \
        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