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 86c5f4d7f2909a8ca728a2b6c2c3c5f3adfb26b6..8a374d511d42b9ff2ffa95dd42f0da8654ec2a64 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -5,44 +5,35 @@ 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)
 
 #
 ##################################################################
 
 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 = \
+liblyxsupport_a_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
-       assert.h \
-       assert.cpp \
        convert.cpp \
        convert.h \
        copied_ptr.h \
@@ -52,17 +43,15 @@ 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 \
-       FileZipListDir.h \
        foreach.h \
        ForkedCalls.cpp \
        ForkedCalls.h \
@@ -71,6 +60,8 @@ liblyxsupport_la_SOURCES = \
        gzstream.cpp \
        gzstream.h \
        kill.cpp \
+       lassert.h \
+       lassert.cpp \
        limited_stack.h \
        lstrings.cpp \
        lstrings.h \
@@ -78,7 +69,6 @@ liblyxsupport_la_SOURCES = \
        lyxlib.h \
        lyxtime.cpp \
        lyxtime.h \
-       lyxsum.cpp \
        Messages.cpp \
        Messages.h \
        os.cpp \
@@ -87,6 +77,7 @@ liblyxsupport_la_SOURCES = \
        Path.h \
        Package.cpp \
        Package.h \
+       qstring_helpers.cpp \
        qstring_helpers.h \
        socktools.cpp \
        socktools.h \
@@ -107,19 +98,11 @@ liblyxsupport_la_SOURCES = \
        unicode.cpp \
        unicode.h \
        weighted_btree.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
+       mythes/mythes.cxx \
+       mythes/mythes.hxx
 
 if INSTALL_MACOSX
-liblyxsupport_la_SOURCES += \
+liblyxsupport_a_SOURCES += \
        linkback/LinkBack.h \
        linkback/LinkBack.m \
        linkback/LinkBackProxy.h \
@@ -149,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 \