migrate *_JAR out of set_soenv.in

2 files changed, 28 insertions, 28 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 7634c5b65246..2705eb42f6b7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -5,18 +5,23 @@
 export SRC_ROOT="@SRC_ROOT@"
 
 export ABOUT_BITMAP="@ABOUT_BITMAP@"
+export BSH_JAR="@BSH_JAR@"
 export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
 export CAIRO_LIBS="@CAIRO_LIBS@"
 export CDR_CFLAGS="@CDR_CFLAGS@"
 export CDR_LIBS="@CDR_LIBS@"
 export COM="@COM@"
+export COMMONS_CODEC_JAR="@COMMONS_CODEC_JAR@"
+export COMMONS_HTTPCLIENT_JAR="@COMMONS_HTTPCLIENT_JAR@"
+export COMMONS_LANG_JAR="@COMMONS_LANG_JAR@"
+export COMMONS_LOGGING_JAR="@COMMONS_LOGGING_JAR@"
 export COM_FOR_BUILD="@COM_FOR_BUILD@"
 export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@"
 export CPPUNIT_LIBS="@CPPUNIT_LIBS@"
 export CPU="@CPU@"
-export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
 export CPUNAME="@CPUNAME@"
 export CPUNAME_FOR_BUILD="@CPUNAME_FOR_BUILD@"
+export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
 export CURL_CFLAGS="@CURL_CFLAGS@"
 export CURL_LIBS="@CURL_LIBS@"
 export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
@@ -66,6 +71,7 @@ export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
 export ENABLE_UGLY="@ENABLE_UGLY@"
 export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
 export ENABLE_ZENITY="@ENABLE_ZENITY@"
+export FLUTE_JAR="@FLUTE_JAR@"
 export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
 export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
 export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
@@ -78,21 +84,23 @@ export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
 export GSTREAMER_LIBS="@GSTREAMER_LIBS@"
 export GTHREAD_CFLAGS="@GTHREAD_CFLAGS@"
 export GTHREAD_LIBS="@GTHREAD_LIBS@"
-export GUI="@GUI@"
-export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
-export GUIBASE="@GUIBASE@"
-export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
 export GTK3_CFLAGS="@GTK3_CFLAGS@"
 export GTK3_LIBS="@GTK3_LIBS@"
 export GTK_CFLAGS="@GTK_CFLAGS@"
 export GTK_LIBS="@GTK_LIBS@"
 export GTK_PRINT_CFLAGS="@GTK_PRINT_CFLAGS@"
 export GTK_PRINT_LIBS="@GTK_PRINT_LIBS@"
+export GUI="@GUI@"
+export GUIBASE="@GUIBASE@"
+export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
+export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
+export HSQLDB_JAR="@HSQLDB_JAR@"
 export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
 export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
 export INPATH="@INPATH@"
 export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
 export INTRO_BIPMAP="@INTRO_BITMAP@"
+export JFREEREPORT_JAR="@JFREEREPORT_JAR@"
 export KDE4_CFLAGS="@KDE4_CFLAGS@"
 export KDE4_LIBS="@KDE4_LIBS@"
 export KDE_CFLAGS="@KDE_CFLAGS@"
@@ -100,16 +108,26 @@ export KDE_GLIB_CFLAGS="@KDE_GLIB_CFLAGS@"
 export KDE_GLIB_LIBS="@KDE_GLIB_LIBS@"
 export KDE_LIBS="@KDE_LIBS@"
 export LFS_CFLAGS="@LFS_CFLAGS@"
+export LIBBASE_JAR="@LIBBASE_JAR@"
 export LIBCMIS_CFLAGS="@LIBCMIS_CFLAGS@"
 export LIBCMIS_LIBS="@LIBCMIS_LIBS@"
 export LIBEXTTEXTCAT_CFLAGS="@LIBEXTTEXTCAT_CFLAGS@"
 export LIBEXTTEXTCAT_LIBS="@LIBEXTTEXTCAT_LIBS@"
+export LIBFONTS_JAR="@LIBFONTS_JAR@"
+export LIBFORMULA_JAR="@LIBFORMULA_JAR@"
+export LIBLAYOUT_JAR="@LIBLAYOUT_JAR@"
+export LIBLOADER_JAR="@LIBLOADER_JAR@"
 export LIBPNG_CFLAGS="@LIBPNG_CFLAGS@"
 export LIBPNG_LIBS="@LIBPNG_LIBS@"
+export LIBREPOSITORY_JAR="@LIBREPOSITORY_JAR@"
+export LIBSERIALIZER_JAR="@LIBSERIALIZER_JAR@"
 export LIBXML_CFLAGS="@LIBXML_CFLAGS@"
+export LIBXML_JAR="@LIBXML_JAR@"
 export LIBXML_LIBS="@LIBXML_LIBS@"
 export LIBXSLT_CFLAGS="@LIBXSLT_CFLAGS@"
 export LIBXSLT_LIBS="@LIBXSLT_LIBS@"
+export LUCENE_ANALYZERS_JAR="@LUCENE_ANALYZERS_JAR@"
+export LUCENE_CORE_JAR="@LUCENE_CORE_JAR@"
 export MDDS_CPPFLAGS="@MDDS_CPPFLAGS@"
 export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@"
 export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@"
@@ -119,6 +137,7 @@ export NEON_CFLAGS="@NEON_CFLAGS@"
 export NEON_LIBS="@NEON_LIBS@"
 export NSS_CFLAGS="@NSS_CFLAGS@"
 export NSS_LIBS="@NSS_LIBS@"
+export OOO_JUNIT_JAR="@OOO_JUNIT_JAR@"
 export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
 export OPENSSL_LIBS="@OPENSSL_LIBS@"
 export OS="@OS@"
@@ -134,9 +153,12 @@ export PYTHON_CFLAGS="@PYTHON_CFLAGS@"
 export PYTHON_LIBS="@PYTHON_LIBS@"
 export REDLAND_CFLAGS="@REDLAND_CFLAGS@"
 export REDLAND_LIBS="@REDLAND_LIBS@"
+export SAC_JAR="@SAC_JAR@"
 export SAL_ENABLE_FILE_LOCKING="1"
 export SAMPLEICC_CFLAGS="@SAMPLEICC_CFLAGS@"
 export SAMPLEICC_LIBS="@SAMPLEICC_LIBS@"
+export SAXON_JAR="@SAXON_JAR@"
+export SERVLETAPI_JAR="@SERVLETAPI_JAR@"
 export SIZEOF_DOUBLE="@SIZEOF_DOUBLE@"
 export SIZEOF_INT="@SIZEOF_INT@"
 export SIZEOF_LONG="@SIZEOF_LONG@"
@@ -212,6 +234,6 @@ export WPG_CFLAGS="@WPG_CFLAGS@"
 export WPG_LIBS="@WPG_LIBS@"
 export WPS_CFLAGS="@WPS_CFLAGS@"
 export WPS_LIBS="@WPS_LIBS@"
-export XSLTPROC="@XSLTPROC@"
 export XRANDR_CFLAGS="@XRANDR_CFLAGS@"
 export XRANDR_LIBS="@XRANDR_LIBS@"
+export XSLTPROC="@XSLTPROC@"
diff --git a/set_soenv.in b/set_soenv.in
index 464727ddc5cd..488eaffe7104 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1283,23 +1283,6 @@ ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
 ToFile( "WITH_THEMES",       "@WITH_THEMES@",      "e");
 ToFile( "WITH_HELPPACK_INTEGRATION",       "@WITH_HELPPACK_INTEGRATION@",      "e");
 ToFile( "WITH_EXTENSION_INTEGRATION",       "@WITH_EXTENSION_INTEGRATION@",      "e");
-ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
-ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
-ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );
-ToFile( "FLUTE_JAR",         "@FLUTE_JAR@",        "e" );
-ToFile( "JFREEREPORT_JAR",   "@JFREEREPORT_JAR@",  "e" );
-ToFile( "LIBLAYOUT_JAR",     "@LIBLAYOUT_JAR@",    "e" );
-ToFile( "LIBLOADER_JAR",     "@LIBLOADER_JAR@",    "e" );
-ToFile( "LIBFORMULA_JAR",    "@LIBFORMULA_JAR@",   "e" );
-ToFile( "LIBREPOSITORY_JAR", "@LIBREPOSITORY_JAR@","e" );
-ToFile( "LIBBASE_JAR",       "@LIBBASE_JAR@",      "e" );
-ToFile( "LIBFONTS_JAR",      "@LIBFONTS_JAR@",     "e" );
-ToFile( "LIBSERIALIZER_JAR", "@LIBSERIALIZER_JAR@","e" );
-ToFile( "COMMONS_CODEC_JAR", "@COMMONS_CODEC_JAR@","e" );
-ToFile( "COMMONS_LANG_JAR",  "@COMMONS_LANG_JAR@", "e" );
-ToFile( "COMMONS_HTTPCLIENT_JAR","@COMMONS_HTTPCLIENT_JAR@","e" );
-ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" );
-ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
 ToFile( "MOC",               "@MOC@",              "e" );
 ToFile( "MOC4",              "@MOC4@",             "e" );
 ToFile( "KDE_HAVE_GLIB",     "@KDE_HAVE_GLIB@",    "e" );
@@ -1581,11 +1564,6 @@ ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
 ToFile( "MYSQL_LIB",         "@MYSQL_LIB@",        "e" );
 ToFile( "MYSQL_DEFINES",     "@MYSQL_DEFINES@",    "e" );
 ToFile( "LIBMYSQL_PATH",     "@LIBMYSQL_PATH@",    "e" );
-ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
-ToFile( "LUCENE_CORE_JAR",   "@LUCENE_CORE_JAR@",  "e" );
-ToFile( "LUCENE_ANALYZERS_JAR",   "@LUCENE_ANALYZERS_JAR@",  "e" );
-ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
-ToFile( "SAXON_JAR",         "@SAXON_JAR@",        "e" );
 ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
 ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );