add toFilesystemEncoding for --binary-dir argument

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 659eaa03f59427913818db7b52a23187c9689280..ab353b497beffabf3ce0a64275f6f1880f1cdc85 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -5,17 +5,14 @@ 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 = SystemcallPrivate.h
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
@@ -25,18 +22,19 @@ BUILT_SOURCES += $(MOCEDFILES)
 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) 
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_INCLUDES)
 
-liblyxsupport_la_SOURCES = \
+liblyxsupport_a_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
        RandomAccessList.h \
+       bind.h \
        convert.cpp \
        convert.h \
        copied_ptr.h \
@@ -58,6 +56,7 @@ liblyxsupport_la_SOURCES = \
        foreach.h \
        ForkedCalls.cpp \
        ForkedCalls.h \
+       functional.h \
        gettext.cpp \
        gettext.h \
        gzstream.cpp \
@@ -72,25 +71,31 @@ liblyxsupport_la_SOURCES = \
        lyxlib.h \
        lyxtime.cpp \
        lyxtime.h \
+       mutex.h \
+       mutex.cpp \
        Messages.cpp \
        Messages.h \
+       numpunct_lyx_char_type.h \
        os.cpp \
        os.h \
-       Path.cpp \
-       Path.h \
+       PathChanger.cpp \
+       PathChanger.h \
        Package.cpp \
        Package.h \
+       ProgressInterface.h \
+       pmprof.h \
        qstring_helpers.cpp \
        qstring_helpers.h \
+       regex.h \
        socktools.cpp \
        socktools.h \
        strfwd.h \
        Systemcall.cpp \
        Systemcall.h \
-       SignalSlot.cpp \
-       SignalSlot.h \
-       SignalSlotPrivate.cpp \
-       SignalSlotPrivate.h \
+       SystemcallPrivate.h \
+       shared_ptr.h \
+       TempFile.cpp \
+       TempFile.h \
        textutils.h \
        Translator.h \
        Timeout.cpp \
@@ -101,9 +106,26 @@ liblyxsupport_la_SOURCES = \
        unicode.cpp \
        unicode.h \
        weighted_btree.h
+if USE_INCLUDED_MYTHES
+liblyxsupport_a_SOURCES += \
+       mythes/mythes.cxx \
+       mythes/mythes.hxx \
+       mythes/license.readme
+endif
+
+#if INSTALL_MACOSX
+#liblyxsupport_a_SOURCES += \
+#      AppleSpellChecker.h \
+#      AppleSpellChecker.mm
+#endif
 
 if INSTALL_MACOSX
-liblyxsupport_la_SOURCES += \
+liblyxsupport_a_SOURCES += \
+       AppleSpeller.h \
+       AppleSpeller.m \
+       AppleScript.h \
+       AppleScript.m \
+       AppleScriptProxy.cpp \
        linkback/LinkBack.h \
        linkback/LinkBack.m \
        linkback/LinkBackProxy.h \
@@ -133,22 +155,25 @@ check_PROGRAMS = \
        check_filetools \
        check_lstrings
 
-check_convert_LDADD = liblyxsupport.la  \
-       $(BOOST_LIBS) $(QT4_CORE_LIB)
-check_convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
+check_convert_LDFLAGS = $(QT4_LDFLAGS)
 check_convert_SOURCES = \
        tests/check_convert.cpp \
+       tests/dummy_functions.cpp \
        tests/boost.cpp
 
-check_filetools_LDADD = liblyxsupport.la $(BOOST_LIBS)
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
+check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_filetools_SOURCES = \
        tests/check_filetools.cpp \
+       tests/dummy_functions.cpp \
        tests/boost.cpp
 
-check_lstrings_LDADD = liblyxsupport.la $(BOOST_LIBS) $(QT4_CORE_LIB)
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
 check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_lstrings_SOURCES = \
        tests/check_lstrings.cpp \
+       tests/dummy_functions.cpp \
        tests/boost.cpp
 
 makeregfiles: ${check_PROGRAMS}