add onoff support for "inset-modify changetype xxx" in include inset

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index b37899f9989b11aac594bf8194a324d4f000c3fd..8a374d511d42b9ff2ffa95dd42f0da8654ec2a64 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -5,27 +5,24 @@ CLEANFILES += $(BUILT_SOURCES)
 EXTRA_DIST = pch.h \
        os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
 
-noinst_LTLIBRARIES = liblyxsupport.la
-
-liblyxsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB) $(BOOST_SIGNALS)
-liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
+noinst_LIBRARIES = liblyxsupport.a
 
 BUILT_SOURCES = $(PCH_FILE)
 
 #########################  Qt stuff  #############################
 #
 
-MOCHEADER = SignalSlotPrivate.h
+MOCHEADER = SignalSlotPrivate.h SystemcallPrivate.h
 
-MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
 CLEANFILES += $(MOCEDFILES)
 BUILT_SOURCES += $(MOCEDFILES)
 
-%_moc.cpp: %.h
+moc_%.cpp: %.h
        $(MOC4) -o $@ $<
 
-liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
+liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
 #
 ##################################################################
@@ -33,7 +30,7 @@ liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) 
 
-liblyxsupport_la_SOURCES = \
+liblyxsupport_a_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
@@ -46,6 +43,7 @@ liblyxsupport_la_SOURCES = \
        docstream.h \
        docstring.cpp \
        docstring.h \
+       docstring_list.h \
        environment.h \
        environment.cpp \
        ExceptionMessage.h \
@@ -71,7 +69,6 @@ liblyxsupport_la_SOURCES = \
        lyxlib.h \
        lyxtime.cpp \
        lyxtime.h \
-       lyxsum.cpp \
        Messages.cpp \
        Messages.h \
        os.cpp \
@@ -100,10 +97,12 @@ liblyxsupport_la_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
-       weighted_btree.h
+       weighted_btree.h \
+       mythes/mythes.cxx \
+       mythes/mythes.hxx
 
 if INSTALL_MACOSX
-liblyxsupport_la_SOURCES += \
+liblyxsupport_a_SOURCES += \
        linkback/LinkBack.h \
        linkback/LinkBack.m \
        linkback/LinkBackProxy.h \
@@ -133,19 +132,19 @@ check_PROGRAMS = \
        check_filetools \
        check_lstrings
 
-check_convert_LDADD = liblyxsupport.la  \
-       $(BOOST_LIBS) $(QT4_CORE_LIB)
+check_convert_LDADD = liblyxsupport.a $(BOOST_LIBS) $(QT4_CORE_LIB)
 check_convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_convert_SOURCES = \
        tests/check_convert.cpp \
        tests/boost.cpp
 
-check_filetools_LDADD = liblyxsupport.la $(BOOST_LIBS)
+check_filetools_LDADD = liblyxsupport.a $(BOOST_LIBS) $(QT4_CORE_LIB)
+check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_filetools_SOURCES = \
        tests/check_filetools.cpp \
        tests/boost.cpp
 
-check_lstrings_LDADD = liblyxsupport.la $(BOOST_LIBS) $(QT4_CORE_LIB)
+check_lstrings_LDADD = liblyxsupport.a $(BOOST_LIBS) $(QT4_CORE_LIB)
 check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_lstrings_SOURCES = \
        tests/check_lstrings.cpp \