From a20737f1b2fec7b3103c79a09b55a14ef72485d2 Mon Sep 17 00:00:00 2001 From: Jakub Kotur Date: Tue, 3 Jun 2014 18:48:06 +0200 Subject: [PATCH] Revert "SZARP Encoding conversions revolution" This reverts commit 7b4aa7bbda1b098eaf14733b9bd3de09361b37a5. It turns out that boost-locale is not present in boost 1.42 which we use in squeeze so we need another approach. Maybe two different implementation one for POSIX one for Windows? --- configure.ac | 2 - debian/control | 2 +- iks/server/Makefile.am | 2 +- isl/paramd/Makefile.am | 2 +- libSzarp/conversion.cc | 109 +++--------------------------------- meaner3/Makefile.am | 4 +- parcook/Makefile.am | 2 +- parcook/analiza/Makefile.am | 2 +- sender/Makefile.am | 2 +- utils/Makefile.am | 12 ++-- wx/common/parlist.cpp | 2 +- wx/confedit/Makefile.am | 2 +- wx/draw3/Makefile.am | 4 +- wx/ekstraktor3/Makefile.am | 2 +- wx/isledit/Makefile.am | 2 +- wx/kontroler3/Makefile.am | 2 +- wx/koper/Makefile.am | 2 +- wx/raporter3/Makefile.am | 2 +- wx/scc/Makefile.am | 2 +- wx/sync/Makefile.am | 4 +- wx/szast/Makefile.am | 2 +- wx/wxhelp/Makefile.am | 2 +- 22 files changed, 35 insertions(+), 132 deletions(-) diff --git a/configure.ac b/configure.ac index 638f52c72..166cbc99a 100644 --- a/configure.ac +++ b/configure.ac @@ -780,7 +780,6 @@ if test "x$has_boost_base" = "xyes" ; then AX_BOOST_THREAD AX_BOOST_SYSTEM AX_BOOST_PROGRAM_OPTIONS - AX_BOOST_LOCALE if test "$with_mingw32" != "yes" ; then AX_BOOST_ASIO @@ -1464,7 +1463,6 @@ if test x$debug_config = xyes ; then echo "BOOST_PROGRAM_OPTIONS_LIB: $BOOST_PROGRAM_OPTIONS_LIB" echo "BOOST_DATE_TIME_LIB: $BOOST_DATE_TIME_LIB" echo "BOOST_PYTHON_LIB: $BOOST_PYTHON_LIB" - echo "BOOST_LOCALE: $BOOST_LOCALE" echo "ZIP_CFLAGS: $ZIP_CFLAGS" echo "ZIP_LIBS: $ZIP_LIBS" fi diff --git a/debian/control b/debian/control index 89c106d8b..b7fc4f7c6 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Priority: optional Maintainer: Dariusz Marcinkiewicz Section: misc Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 5.0.38), autotools-dev, automake, autoconf, autoconf-archive, libwxgtk2.8-dev, wx-common, libxml2-dev, bison, flex, imagemagick, jadetex, gettext, xsltproc, libxslt1-dev, libnewt-dev, libssl-dev, libpam-dev, libcurl3-dev, perl, librsync-dev, libgtk2.0-dev, libsqlite3-dev, libldap2-dev (>= 2.3.5), python-setuptools (>= 0.6b3-1), libzip-dev, jade, python-pybabel, libicu-dev, libxt-dev, libc-ares-dev, libxmlrpc-epi-dev, libluajit-dev | liblua5.1-0-dev, libftgl-dev, libboost-dev(>=1.42), libboost-system-dev(>=1.42), libboost-thread-dev(>=1.42), libboost-program-options-dev(>=1.42), libboost-regex-dev(>=1.42), libboost-filesystem-dev(>=1.42), libboost-locale-dev(>=1.42), libboost-python-dev(>=1.42), libboost-signals-dev, libasio-dev, libgstreamer0.10-dev, libstdc++-dev, libxpm-dev, libevent-dev(>=2.0), libgstreamer-plugins-base0.10-dev, docbook-dsssl, rsync, python-support, konwert, pyqt4-dev-tools, libtool, python-dev +Build-Depends: debhelper (>= 5.0.38), autotools-dev, automake, autoconf, autoconf-archive, libwxgtk2.8-dev, wx-common, libxml2-dev, bison, flex, imagemagick, jadetex, gettext, xsltproc, libxslt1-dev, libnewt-dev, libssl-dev, libpam-dev, libcurl3-dev, perl, librsync-dev, libgtk2.0-dev, libsqlite3-dev, libldap2-dev (>= 2.3.5), python-setuptools (>= 0.6b3-1), libzip-dev, jade, python-pybabel, libicu-dev, libxt-dev, libc-ares-dev, libxmlrpc-epi-dev, libluajit-dev | liblua5.1-0-dev, libftgl-dev, libboost-dev(>=1.42), libboost-system-dev(>=1.42), libboost-thread-dev(>=1.42), libboost-program-options-dev(>=1.42), libboost-regex-dev(>=1.42), libboost-filesystem-dev(>=1.42), libboost-python-dev(>=1.42), libboost-signals-dev, libasio-dev, libgstreamer0.10-dev, libstdc++-dev, libxpm-dev, libevent-dev(>=2.0), libgstreamer-plugins-base0.10-dev, docbook-dsssl, rsync, python-support, konwert, pyqt4-dev-tools, libtool, python-dev ## TODO qba: libcgal was removed because its not avaiable on squeeze platform ## it should return to build dependences after we drop support to squeeze diff --git a/iks/server/Makefile.am b/iks/server/Makefile.am index ddf1b8969..20d70787d 100644 --- a/iks/server/Makefile.am +++ b/iks/server/Makefile.am @@ -19,7 +19,7 @@ LDADD = @PTHREAD_CFLAGS@ $(LIBSZARP2) $(LIBSZARP) \ @XSLT_LIBS@ @XML_LIBS@ @LUA_LIBS@ \ @BOOST_LDFLAGS@ @BOOST_ASIO_LIB@ @BOOST_SYSTEM_LIB@ \ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ \ - @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_LOCALE_LIB@ + @BOOST_PROGRAM_OPTIONS_LIB@ bin_PROGRAMS = iks-server diff --git a/isl/paramd/Makefile.am b/isl/paramd/Makefile.am index f3b0ac3e1..860595c42 100644 --- a/isl/paramd/Makefile.am +++ b/isl/paramd/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS = -I@srcdir@/../../include \ LDADD=../server/libserver.la \ ../../libSzarp/libSzarp.la \ ../../libSzarp2/libSzarp2.la \ - @SSL_LIBS@ @PAM_LIBS@ @XML_LIBS@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @LUA_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ + @SSL_LIBS@ @PAM_LIBS@ @XML_LIBS@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @LUA_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ SHORTHOST=$(shell hostname -s) diff --git a/libSzarp/conversion.cc b/libSzarp/conversion.cc index 913fc962f..ca3180806 100644 --- a/libSzarp/conversion.cc +++ b/libSzarp/conversion.cc @@ -7,9 +7,6 @@ #include #include -#ifndef MINGW32 -#include -#endif #ifdef MINGW32 #include @@ -22,7 +19,7 @@ namespace { #ifdef MINGW32 const char *_locale_string = "CP1250"; #else - const char *_locale_string = "UTF-8"; + const char *_locale_string = "ISO_8859-2"; #endif #ifdef MINGW32 @@ -37,12 +34,6 @@ namespace { boost::mutex m_mutex; public: IconvWrapper(const char* tocode, const char* fromcode){ -#ifndef MINGW32 - boost::locale::generator gen; - std::locale loc=gen(""); - if (!std::use_facet(loc).utf8()) - _locale_string = "ISO_8859-2"; -#endif m_handle = iconv_open(tocode, fromcode); if (m_handle == (iconv_t) -1) throw std::runtime_error(std::string("LibSzarp: Error opening iconv: ") + fromcode + " to " + tocode); @@ -103,7 +94,6 @@ namespace { namespace SC { -/* UTF-8 -> SZARP */ #ifndef MINGW32 IconvWrapper utf2szarp_iw("WCHAR_T", UTF8); #endif @@ -126,7 +116,6 @@ namespace SC { #endif } -/* SZARP -> UTF-8 */ #ifndef MINGW32 IconvWrapper szarp2utf_iw(UTF8, "WCHAR_T"); #endif @@ -149,11 +138,10 @@ namespace SC { #endif } -/* LOCAL -> SZARP */ #ifndef MINGW32 - IconvWrapper local2szarp_iw("WCHAR_T", _locale_string); + IconvWrapper ascii2szarp_iw("WCHAR_T", _locale_string); #endif - std::wstring local2szarp(const std::basic_string& c) { + std::wstring ascii2szarp(const std::basic_string& c) { #ifdef MINGW32 if (c.size() == 0) return std::wstring(); @@ -167,36 +155,12 @@ namespace SC { return std::wstring(buff.get(), res); #else - return local2szarp_iw.convert(c); -#endif - } - -/* SZARP -> LOCAL */ -#ifndef MINGW32 - IconvWrapper szarp2local_iw(_locale_string, "WCHAR_T"); -#endif - std::string szarp2local(const std::basic_string& c) { -#ifdef MINGW32 - if (c.size() == 0) - return std::string(); - - int size_ = c.size() * 2; - scoped_array buff(new char[size_]); - int res = WideCharToMultiByte(CP_ACP, 0, c.c_str(), -1, buff.get(), size_, NULL, NULL); - - if (res == 0) { - throw std::runtime_error("Incomplete multibyte sequence encountered in convertsion"); - } - - return std::string(buff.get(), res - 1); -#else - return szarp2local_iw.convert(c); + return ascii2szarp_iw.convert(c); #endif } -/* SZARP -> ASCII */ #ifndef MINGW32 - IconvWrapper szarp2ascii_iw("ASCII//TRANSLIT", "WCHAR_T"); + IconvWrapper szarp2ascii_iw(_locale_string, "WCHAR_T"); #endif std::string szarp2ascii(const std::basic_string& c) { #ifdef MINGW32 @@ -217,59 +181,16 @@ namespace SC { #endif } -/* ASCII -> SZARP */ -#ifndef MINGW32 - IconvWrapper ascii2szarp_iw("WCHAR_T", "ASCII"); -#endif - std::wstring ascii2szarp(const std::basic_string& c) { -#ifdef MINGW32 - if (c.size() == 0) - return std::wstring(); - - scoped_array buff(new wchar_t[c.size() + 1]); - int res = MultiByteToWideChar(CP_ACP, 0, c.c_str(), -1, buff.get(), (c.size() + 1) * sizeof(wchar_t)); - - if (res == 0) { - throw std::runtime_error("Incomplete multibyte sequence encountered in convertsion"); - } - - return std::wstring(buff.get(), res); -#else - return ascii2szarp_iw.convert(c); -#endif - } - -/* UTF-8 -> ASCII */ - IconvWrapper utf2ascii_iw("ASCII//TRANSLIT", UTF8); + IconvWrapper utf2ascii_iw(_locale_string, UTF8); std::string utf2ascii(const std::basic_string& c) { return utf2ascii_iw.convert(c); } -/* ASCII -> UTF-8 */ - IconvWrapper ascii2utf_iw(UTF8, "ASCII"); + IconvWrapper ascii2utf_iw(UTF8, _locale_string); std::basic_string ascii2utf(const std::basic_string& c) { return ascii2utf_iw.convert(c); } -/* UTF-8 -> LOCAL */ - IconvWrapper utf2local_iw(_locale_string, UTF8); - std::string utf2local(const std::basic_string& c) { - return utf2local_iw.convert(c); - } - -/* LOCAL -> UTF-8 */ - IconvWrapper local2utf_iw(UTF8, _locale_string); - std::basic_string local2utf(const std::basic_string& c) { - return local2utf_iw.convert(c); - } - - -/* Description - * A means ASCII - * L means LOCAL (ISO8859-2/UTF-8 for Linux, CP1250 for Windows) - * S means SZARP (internal) - * U means UTF-8 - */ std::wstring U2S(const std::basic_string& c) { return utf2szarp(c); } @@ -286,14 +207,6 @@ namespace SC { return szarp2ascii(c); } - std::wstring L2S(const std::basic_string& c) { - return local2szarp(c); - } - - std::string S2L(const std::basic_string& c) { - return szarp2local(c); - } - std::basic_string A2U(const std::basic_string& c) { return ascii2utf(c); } @@ -302,14 +215,6 @@ namespace SC { return utf2ascii(c); } - std::basic_string L2U(const std::basic_string& c) { - return local2utf(c); - } - - std::string U2L(const std::basic_string& c) { - return utf2local(c); - } - std::wstring lua_error2szarp(const char* lua_error) { diff --git a/meaner3/Makefile.am b/meaner3/Makefile.am index 174b0e025..e7605bcb7 100644 --- a/meaner3/Makefile.am +++ b/meaner3/Makefile.am @@ -22,7 +22,7 @@ UTILSDIR=utils LIBSZARP=../libSzarp/libSzarp.la LIBSZARP2=../libSzarp2/libSzarp2.la -LDADD = @PTHREAD_CFLAGS@ $(LIBSZARP2) $(LIBSZARP) @XSLT_LIBS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_LOCALE_LIB@ +LDADD = @PTHREAD_CFLAGS@ $(LIBSZARP2) $(LIBSZARP) @XSLT_LIBS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ # Programs to create @@ -102,5 +102,5 @@ extrszb_SOURCES= $(UTILSDIR)/extrszb.cc extrszb_LDADD = $(LIBSZARP) $(LIBSZARP2) \ @PTHREAD_CFLAGS@ @XML_LIBS@ @XSLT_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ \ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ \ - @BOOST_LOCALE_LIB@ @ZIP_LIBS@ + @ZIP_LIBS@ diff --git a/parcook/Makefile.am b/parcook/Makefile.am index bbf641da6..c76ce9bdb 100644 --- a/parcook/Makefile.am +++ b/parcook/Makefile.am @@ -24,7 +24,7 @@ AM_CPPFLAGS = @XML_CFLAGS@ @LUA_CFLAGS@ \ LIBSZARP2 = ../libSzarp2/libSzarp2.la LIBSZARP = ../libSzarp/libSzarp.la -LDADD = $(LIBSZARP2) $(LIBSZARP) @EVENT_LIBS@ @PTHREAD_CFLAGS@ @XML_LIBS@ @LUA_LIBS@ $(BOOST_LDFLAGS) $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB) $(BOOST_DATE_TIME_LIB) $(BOOST_REGEX_LIB) $(BOOST_LOCALE_LIB) +LDADD = $(LIBSZARP2) $(LIBSZARP) @EVENT_LIBS@ @PTHREAD_CFLAGS@ @XML_LIBS@ @LUA_LIBS@ $(BOOST_LDFLAGS) $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB) $(BOOST_DATE_TIME_LIB) $(BOOST_REGEX_LIB) # Aditional libraries for daemons using dlopen DL = -ldl diff --git a/parcook/analiza/Makefile.am b/parcook/analiza/Makefile.am index ac0a901a3..d1042b0f9 100644 --- a/parcook/analiza/Makefile.am +++ b/parcook/analiza/Makefile.am @@ -21,7 +21,7 @@ LIBSZARP=../../libSzarp/libSzarp.la LIBSZARP2=../../libSzarp2/libSzarp2.la LIBSZARPFB = ../../libSzarpfb/libSzarpfb.a -LDADD = $(LIBSZARP2) $(LIBSZARP) @PTHREAD_CFLAGS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_LOCALE_LIB@ +LDADD = $(LIBSZARP2) $(LIBSZARP) @PTHREAD_CFLAGS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ # Programs to create diff --git a/sender/Makefile.am b/sender/Makefile.am index 2de7d9664..aa5ec5a9a 100644 --- a/sender/Makefile.am +++ b/sender/Makefile.am @@ -20,7 +20,7 @@ AM_CPPFLAGS = @LUA_CFLAGS@ \ LIBSZARP=../libSzarp/libSzarp.la \ ../libSzarp2/libSzarp2.la -LDADD = $(LIBSZARP) @XML_LIBS@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_LOCALE_LIB@ +LDADD = $(LIBSZARP) @XML_LIBS@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_SYSTEM_LIB@ # Programs to create diff --git a/utils/Makefile.am b/utils/Makefile.am index 2b227b86b..2ecdca7fc 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -111,25 +111,25 @@ remarksserver_PYTHON = \ agregator_SOURCES = agregator.cc -agregator_LDADD = $(LIBSZARP2) $(LIBSZARP) @PTHREAD_CFLAGS@ @BOOST_SYSTEM_LIB@ @XML_LIBS@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ @SSL_LIBS@ +agregator_LDADD = $(LIBSZARP2) $(LIBSZARP) @PTHREAD_CFLAGS@ @BOOST_SYSTEM_LIB@ @XML_LIBS@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @SSL_LIBS@ ipk2szarp_SOURCES = ipk2szarp.cc -ipk2szarp_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ $(LIBSZARP2) $(LIBSZARP2) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +ipk2szarp_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ $(LIBSZARP2) $(LIBSZARP2) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ lpparse_SOURCES = lpparse.cc lpparse_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ $(LIBSZARP) ipkrep_SOURCES = ipkrep.cc -ipkrep_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ @BOOST_SYSTEM_LIB@ $(LIBSZARP2) @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +ipkrep_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ @BOOST_SYSTEM_LIB@ $(LIBSZARP2) @BOOST_FILESYSTEM_LIB@ precconv_SOURCES = precconv.cc -precconv_LDADD = $(LIBSZARP2) $(LIBSZARP) @PTHREAD_CFLAGS@ @XML_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +precconv_LDADD = $(LIBSZARP2) $(LIBSZARP) @PTHREAD_CFLAGS@ @XML_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ analiza2ipk_SOURCES = analiza2ipk.cc -analiza2ipk_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ $(LIBSZARP2) $(LIBSZARP) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +analiza2ipk_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ $(LIBSZARP2) $(LIBSZARP) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ ipkmax_SOURCES = ipkmax.cc -ipkmax_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ $(LIBSZARP) $(LIBSZARP2) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +ipkmax_LDADD = @PTHREAD_CFLAGS@ @XML_LIBS@ $(LIBSZARP) $(LIBSZARP2) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ crypt_LDADD = -lcrypt diff --git a/wx/common/parlist.cpp b/wx/common/parlist.cpp index fd16d5d36..7597fdd99 100644 --- a/wx/common/parlist.cpp +++ b/wx/common/parlist.cpp @@ -210,7 +210,7 @@ bool szParList::SaveFile(wxString path, bool showErrors) #ifdef MINGW32 int ret = xmlSaveFormatFileEnc(SC::S2A(path.c_str()).c_str(), xml, "CP1250", 1); #else - int ret = xmlSaveFormatFileEnc(SC::S2A(path.c_str()).c_str(), xml, "UTF-8", 1); + int ret = xmlSaveFormatFileEnc(SC::S2A(path.c_str()).c_str(), xml, "ISO-8859-2", 1); #endif if (ret == -1) { if (showErrors) { diff --git a/wx/confedit/Makefile.am b/wx/confedit/Makefile.am index 9e42c5bb4..7105933c5 100644 --- a/wx/confedit/Makefile.am +++ b/wx/confedit/Makefile.am @@ -33,7 +33,7 @@ ipkedit_SOURCES = \ dlistctrl.cc dlistctrl.h \ ../common/dcolors.h -ipkedit_LDADD = $(LIBWXCOMMON) @WX_LIBS@ @XML_LIBS@ $(LIBSZARP2) $(LIBSZARP) @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +ipkedit_LDADD = $(LIBWXCOMMON) @WX_LIBS@ @XML_LIBS@ $(LIBSZARP2) $(LIBSZARP) @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ ipkedit_LOCALES = pl/ipkedit.mo ipkedit_LOCALES_SRC = pl/ipkedit.po diff --git a/wx/draw3/Makefile.am b/wx/draw3/Makefile.am index 943c202ce..d26ebd6b6 100644 --- a/wx/draw3/Makefile.am +++ b/wx/draw3/Makefile.am @@ -131,10 +131,10 @@ draw3test_SOURCES = \ test.cpp draw3_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) $(LIBWXSCINTILLA) -draw3_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) $(LIBWXSCINTILLA) @XSLT_LIBS@ @ZIP_LIBS@ @SSL_LIBS@ @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @GDK_LIBS@ @SQLITE3_LIBS@ @GSTREAMER_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_LOCALE_LIB@ @FTGL_LIBS@ @WXGL_LIBS@ @XMLRPC_EPI_LIBS@ @CARES_LIBS@ @MINGW32_LIBS@ @CGAL_LIBS@ +draw3_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) $(LIBWXSCINTILLA) @XSLT_LIBS@ @ZIP_LIBS@ @SSL_LIBS@ @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @GDK_LIBS@ @SQLITE3_LIBS@ @GSTREAMER_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @FTGL_LIBS@ @WXGL_LIBS@ @XMLRPC_EPI_LIBS@ @CARES_LIBS@ @MINGW32_LIBS@ @CGAL_LIBS@ draw3test_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) $(LIBWXSCINTILLA) -draw3test_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) $(LIBWXSCINTILLA) @XSLT_LIBS@ @ZIP_LIBS@ @SSL_LIBS@ @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @GDK_LIBS@ @SQLITE3_LIBS@ @GSTREAMER_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_LOCALE_LIB@ @FTGL_LIBS@ @WXGL_LIBS@ @XMLRPC_EPI_LIBS@ @CARES_LIBS@ @MINGW32_LIBS@ @CGAL_LIBS@ +draw3test_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) $(LIBWXSCINTILLA) @XSLT_LIBS@ @ZIP_LIBS@ @SSL_LIBS@ @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @GDK_LIBS@ @SQLITE3_LIBS@ @GSTREAMER_LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @FTGL_LIBS@ @WXGL_LIBS@ @XMLRPC_EPI_LIBS@ @CARES_LIBS@ @MINGW32_LIBS@ @CGAL_LIBS@ draw3_LOCALES_TMP = @srcdir@/draw3.tpo CLEANFILES = fr/draw3.mo pl/draw3.mo de/draw3.mo $(draw3_LOCALES_TMP) diff --git a/wx/ekstraktor3/Makefile.am b/wx/ekstraktor3/Makefile.am index 79a0b833f..5b6e81498 100644 --- a/wx/ekstraktor3/Makefile.am +++ b/wx/ekstraktor3/Makefile.am @@ -41,7 +41,7 @@ endif ekstraktor3_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZ) $(LIBSZARP2) $(LIBSZAR) ekstraktor3_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) @XML_LIBS@ @WX_LIBS@ \ @XSLT_LIBS@ @LUA_LIBS@ @ZIP_LIBS@ \ - @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_LOCALE_LIB@ @MINGW32_LIBS@ + @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ @MINGW32_LIBS@ ekstraktor3_LOCALES = pl/ekstraktor3.mo ekstraktor3_LOCALES_SRC = pl/ekstraktor3.po diff --git a/wx/isledit/Makefile.am b/wx/isledit/Makefile.am index 5586da71c..09cfe1a8a 100644 --- a/wx/isledit/Makefile.am +++ b/wx/isledit/Makefile.am @@ -35,7 +35,7 @@ endif isledit_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) isledit_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) \ - @XML_LIBS@ @WX_LIBS@ @CURL_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ + @XML_LIBS@ @WX_LIBS@ @CURL_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ isledit_LOCALES = pl/isledit.mo isledit_LOCALES_SRC = pl/isledit.po diff --git a/wx/kontroler3/Makefile.am b/wx/kontroler3/Makefile.am index 74083e45e..f634345c3 100644 --- a/wx/kontroler3/Makefile.am +++ b/wx/kontroler3/Makefile.am @@ -33,7 +33,7 @@ RESOURCES = endif kontroler3_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) -kontroler3_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @CURL_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +kontroler3_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @CURL_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ kontroler3_LOCALES = pl/kontroler3.mo kontroler3_LOCALES_SRC = pl/kontroler3.po diff --git a/wx/koper/Makefile.am b/wx/koper/Makefile.am index ce7ef38be..bfb0e65b5 100644 --- a/wx/koper/Makefile.am +++ b/wx/koper/Makefile.am @@ -50,7 +50,7 @@ koper_SOURCES = \ koperpopup.cpp koper_DEPENDENCIES = $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) -koper_LDADD = $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) @WX_LIBS@ @XML_LIBS@ @LUA_LIBS@ @FTGL_LIBS@ @WXGL_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_LOCALE_LIB@ +koper_LDADD = $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) @WX_LIBS@ @XML_LIBS@ @LUA_LIBS@ @FTGL_LIBS@ @WXGL_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ # Rule to create mo files %.mo: %.po diff --git a/wx/raporter3/Makefile.am b/wx/raporter3/Makefile.am index acfdf9a8d..adda9713f 100644 --- a/wx/raporter3/Makefile.am +++ b/wx/raporter3/Makefile.am @@ -53,7 +53,7 @@ endif raporter3_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) raporter3_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) \ - @XML_LIBS@ @WX_LIBS@ @CURL_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ + @XML_LIBS@ @WX_LIBS@ @CURL_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ raporter3_LOCALES = pl/raporter3.mo raporter3_LOCALES_SRC = pl/raporter3.po diff --git a/wx/scc/Makefile.am b/wx/scc/Makefile.am index 16419682c..b19f78f57 100644 --- a/wx/scc/Makefile.am +++ b/wx/scc/Makefile.am @@ -55,7 +55,7 @@ RESOURCES = endif scc_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) -scc_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) @WX_LIBS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ +scc_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) @WX_LIBS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ # Creating resources file with icons for Windows ICON_SRC := ../../resources/wx/icons/szarp64.xpm diff --git a/wx/sync/Makefile.am b/wx/sync/Makefile.am index e2001cf76..de89183d3 100644 --- a/wx/sync/Makefile.am +++ b/wx/sync/Makefile.am @@ -29,8 +29,8 @@ LIBWXCOMMON=../common/libwxcommon.la ssc_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) ssc_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) $(LIBSZARP2) \ - @WX_LIBS@ @RSYNC_LIBS@ @SSL_LIBS@ @LUA_LIBS@ @XML_LIBS@ $(MINGW32_EXTRA) @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @CARES_LIBS@ @BOOST_THREAD_LIB@ @BOOST_LOCALE_LIB@ @MINGW32_LIBS@ -sss_LDADD = @RSYNC_LIBS@ @SSL_LIBS@ @PAM_LIBS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_LOCALE_LIB@ $(LIBSZARP) $(LIBSZARP2) + @WX_LIBS@ @RSYNC_LIBS@ @SSL_LIBS@ @LUA_LIBS@ @XML_LIBS@ $(MINGW32_EXTRA) @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @CARES_LIBS@ @BOOST_THREAD_LIB@ @MINGW32_LIBS@ +sss_LDADD = @RSYNC_LIBS@ @SSL_LIBS@ @PAM_LIBS@ @XML_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ $(LIBSZARP) $(LIBSZARP2) ssc_CXXFLAGS= -DUSE_WX $(AM_CXXFLAGS) diff --git a/wx/szast/Makefile.am b/wx/szast/Makefile.am index 82d075352..9d5dc8851 100644 --- a/wx/szast/Makefile.am +++ b/wx/szast/Makefile.am @@ -44,7 +44,7 @@ RESOURCES = endif szast_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) -szast_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) @SSL_LIBS@ @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @BOOST_LOCALE_LIB@ @MINGW32_LIBS@ +szast_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP2) $(LIBSZARP) @SSL_LIBS@ @XML_LIBS@ @WX_LIBS@ @LUA_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_THREAD_LIB@ @MINGW32_LIBS@ szast_LOCALES = pl/szast.mo szast_LOCALES_SRC = pl/szast.po diff --git a/wx/wxhelp/Makefile.am b/wx/wxhelp/Makefile.am index ed828a20c..916f796dd 100644 --- a/wx/wxhelp/Makefile.am +++ b/wx/wxhelp/Makefile.am @@ -32,7 +32,7 @@ RESOURCES = endif wxhelp_DEPENDENCIES = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) -wxhelp_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) @WX_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_LOCALE_LIB@ @XML_LIBS@ +wxhelp_LDADD = $(RESOURCES) $(LIBWXCOMMON) $(LIBSZARP) @WX_LIBS@ @BOOST_LDFLAGS@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @XML_LIBS@ # Creating resources file with icons for Windows # Application does not use this icon - but Windows use it