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 bb84cc85ca2fb2ca50627d143c9ac06ebd350707..1c1f8a038d2216d6395cb2e6fea9a16588fad053 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -12,48 +12,59 @@ liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
 
 BUILT_SOURCES = $(PCH_FILE)
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) -I$(srcdir)/minizip
+#########################  Qt stuff  #############################
+#
+
+MOCHEADER = SignalSlotPrivate.h
+
+MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+
+CLEANFILES += $(MOCEDFILES)
+BUILT_SOURCES += $(MOCEDFILES)
+
+%_moc.cpp: %.h
+       $(MOC4) -o $@ $<
 
-# 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++
+liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
+
+#
+##################################################################
+
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) 
 
 liblyxsupport_la_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
-       abort.cpp \
-       chdir.cpp \
        convert.cpp \
        convert.h \
-       copy.cpp \
        copied_ptr.h \
-       cow_ptr.h \
-       debugstream.h \
+       debug.cpp \
+       debug.h \
        docstream.cpp \
        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 \
-       Forkedcall.cpp \
-       Forkedcall.h \
-       ForkedCallQueue.cpp \
-       ForkedCallQueue.h \
-       ForkedcallsController.cpp \
-       ForkedcallsController.h \
-       getcwd.cpp \
+       foreach.h \
+       ForkedCalls.cpp \
+       ForkedCalls.h \
+       gettext.cpp \
+       gettext.h \
        gzstream.cpp \
        gzstream.h \
        kill.cpp \
+       lassert.h \
+       lassert.cpp \
        limited_stack.h \
        lstrings.cpp \
        lstrings.h \
@@ -62,7 +73,8 @@ liblyxsupport_la_SOURCES = \
        lyxtime.cpp \
        lyxtime.h \
        lyxsum.cpp \
-       mkdir.cpp \
+       Messages.cpp \
+       Messages.h \
        os.cpp \
        os.h \
        Path.cpp \
@@ -71,14 +83,15 @@ liblyxsupport_la_SOURCES = \
        Package.h \
        qstring_helpers.cpp \
        qstring_helpers.h \
-       rename.cpp \
        socktools.cpp \
        socktools.h \
        strfwd.h \
        Systemcall.cpp \
        Systemcall.h \
-       tempname.cpp \
-       textutils.cpp \
+       SignalSlot.cpp \
+       SignalSlot.h \
+       SignalSlotPrivate.cpp \
+       SignalSlotPrivate.h \
        textutils.h \
        Translator.h \
        Timeout.cpp \
@@ -88,17 +101,17 @@ liblyxsupport_la_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
-       unlink.cpp \
-       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 += \
+       linkback/LinkBack.h \
+       linkback/LinkBack.m \
+       linkback/LinkBackProxy.h \
+       linkback/LinkBackProxy.m \
+       linkback/LinkBackServer.h \
+       linkback/LinkBackServer.m
+endif
 
 ############################## Tests ##################################
 
@@ -112,29 +125,28 @@ EXTRA_DIST += \
 
 
 TESTS = \
-       test_convert \
-       test_filetools \
-       test_lstrings
+       tests/test_convert \
+       tests/test_filetools \
+       tests/test_lstrings
 
 check_PROGRAMS = \
        check_convert \
        check_filetools \
        check_lstrings
 
-check_convert_LDADD = ../debug.o convert.o docstring.o lstrings.o unicode.o \
-       qstring_helpers.o $(BOOST_LIBS) $(QT4_CORE_LIB)
+check_convert_LDADD = liblyxsupport.la  \
+       $(BOOST_LIBS) $(QT4_CORE_LIB)
 check_convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_convert_SOURCES = \
        tests/check_convert.cpp \
        tests/boost.cpp
 
-check_filetools_LDADD = ../debug.o libsupport.la $(BOOST_LIBS)
+check_filetools_LDADD = liblyxsupport.la $(BOOST_LIBS)
 check_filetools_SOURCES = \
        tests/check_filetools.cpp \
        tests/boost.cpp
 
-check_lstrings_LDADD = ../debug.o lstrings.o convert.o docstring.o unicode.o \
-       qstring_helpers.o $(QT4_CORE_LIB)
+check_lstrings_LDADD = liblyxsupport.la $(BOOST_LIBS) $(QT4_CORE_LIB)
 check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_lstrings_SOURCES = \
        tests/check_lstrings.cpp \
@@ -142,5 +154,5 @@ check_lstrings_SOURCES = \
 
 makeregfiles: ${check_PROGRAMS}
        for all in ${check_PROGRAMS} ; do \
-               ./$$all > ${srcdir}/regfiles/$$all ; \
+               ./$$all > ${srcdir}/tests/regfiles/$$all ; \
        done