Fix layout bug. Pasting text into a cell tried to set Standard layout, because

[lyx.git] / src / support / Makefile.am

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index daa62e532bf3ea625be904cf0fdd7ebce932d4c2..1c1f8a038d2216d6395cb2e6fea9a16588fad053 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -31,11 +31,7 @@ liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
 ##################################################################
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) -I$(srcdir)/minizip
-
-# force the use of C++ compiler for minizip/*.c files, because
-# gcc can not go through the included boost files.
-liblyxsupport_la_CFLAGS = -x c++
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) 
 
 liblyxsupport_la_SOURCES = \
        FileMonitor.h \
@@ -50,13 +46,13 @@ liblyxsupport_la_SOURCES = \
        docstream.h \
        docstring.cpp \
        docstring.h \
+       docstring_list.h \
        environment.h \
        environment.cpp \
        ExceptionMessage.h \
-       FileFilterList.cpp \
-       FileFilterList.h \
        FileName.cpp \
        FileName.h \
+       FileNameList.h \
        filetools.cpp \
        filetools.h \
        foreach.h \
@@ -67,6 +63,8 @@ liblyxsupport_la_SOURCES = \
        gzstream.cpp \
        gzstream.h \
        kill.cpp \
+       lassert.h \
+       lassert.cpp \
        limited_stack.h \
        lstrings.cpp \
        lstrings.h \
@@ -83,6 +81,7 @@ liblyxsupport_la_SOURCES = \
        Path.h \
        Package.cpp \
        Package.h \
+       qstring_helpers.cpp \
        qstring_helpers.h \
        socktools.cpp \
        socktools.h \
@@ -102,16 +101,7 @@ liblyxsupport_la_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
-       minizip/crypt.h \
-       minizip/ioapi.c \
-       minizip/ioapi.h \
-       minizip/iowin32.c \
-       minizip/iowin32.h \
-       minizip/unzip.c \
-       minizip/unzip.h \
-       minizip/zip.c \
-       minizip/zip.h \
-       minizip/zipunzip.cpp
+       weighted_btree.h
 
 if INSTALL_MACOSX
 liblyxsupport_la_SOURCES += \