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 e5476619f37462c9bf9a096da73d77efc5bc98dd..ab353b497beffabf3ce0a64275f6f1880f1cdc85 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -28,7 +28,7 @@ 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_a_SOURCES = \
        FileMonitor.h \
@@ -38,8 +38,6 @@ liblyxsupport_a_SOURCES = \
        convert.cpp \
        convert.h \
        copied_ptr.h \
-       CryptographicEncryption.h \
-       CryptographicEncryption.cpp \
        debug.cpp \
        debug.h \
        docstream.cpp \
@@ -58,6 +56,7 @@ liblyxsupport_a_SOURCES = \
        foreach.h \
        ForkedCalls.cpp \
        ForkedCalls.h \
+       functional.h \
        gettext.cpp \
        gettext.h \
        gzstream.cpp \
@@ -72,18 +71,22 @@ liblyxsupport_a_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 \
@@ -91,6 +94,8 @@ liblyxsupport_a_SOURCES = \
        Systemcall.h \
        SystemcallPrivate.h \
        shared_ptr.h \
+       TempFile.cpp \
+       TempFile.h \
        textutils.h \
        Translator.h \
        Timeout.cpp \
@@ -100,10 +105,13 @@ liblyxsupport_a_SOURCES = \
        userinfo.h \
        unicode.cpp \
        unicode.h \
-       weighted_btree.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 += \
@@ -115,6 +123,9 @@ if INSTALL_MACOSX
 liblyxsupport_a_SOURCES += \
        AppleSpeller.h \
        AppleSpeller.m \
+       AppleScript.h \
+       AppleScript.m \
+       AppleScriptProxy.cpp \
        linkback/LinkBack.h \
        linkback/LinkBack.m \
        linkback/LinkBackProxy.h \
@@ -144,22 +155,25 @@ check_PROGRAMS = \
        check_filetools \
        check_lstrings
 
-check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
+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.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_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.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
+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}