move *_CFLAGS and *_LIBS to config_host.mk

1 files changed, 0 insertions, 82 deletions

diff --git a/set_soenv.in b/set_soenv.in
index 2b6142b42c87..e7938f3d563c 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1380,7 +1380,6 @@ ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
 }
 ToFile( "PRODUCT",           "@PRODUCT@",        "e" );
 ToFile( "PROEXT",            $PROEXT,            "e" );
-ToFile( "VALGRIND_CFLAGS",   "@VALGRIND_CFLAGS@","e" );
 ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" );
 ToFile( "UNIXWRAPPERNAME",   "@UNIXWRAPPERNAME@","e" );
 ToFile( "PRODUCTNAME",       "@PRODUCTNAME@",    "e" );
@@ -1396,7 +1395,6 @@ ToFile( "BUILD_MOZAB",       "@BUILD_MOZAB@",    "e" );
 ToFile( "PREBUILD_MOZAB",    $PREBUILD_MOZAB,    "e" );
 ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
 ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
-ToFile( "MOZILLA_HEADERS_CFLAGS",  "@MOZILLA_HEADERS_CFLAGS@", "e" );
 ToFile( "SYSTEM_MOZILLA_HEADERS",  "@SYSTEM_MOZILLA_HEADERS@", "e" );
 ToFile( "MOZILLABUILD",  "@MOZILLABUILD@", "e" );
 ToFile( "BUILD_VER_STRING",  "@BUILD_VER_STRING@", "e" );
@@ -1404,12 +1402,6 @@ if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
 ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
 }
 ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
-ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
-ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-ToFile( "GTK3_CFLAGS",       "@GTK3_CFLAGS@",      "e" );
-ToFile( "GTK3_LIBS",         "@GTK3_LIBS@",        "e" );
-ToFile( "GTHREAD_CFLAGS",    "@GTHREAD_CFLAGS@",   "e" );
-ToFile( "GTHREAD_LIBS",      "@GTHREAD_LIBS@",     "e" );
 ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
 ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
 ToFile( "WITH_THEMES",       "@WITH_THEMES@",      "e");
@@ -1431,21 +1423,9 @@ 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( "SAMPLEICC_CFLAGS", "@SAMPLEICC_CFLAGS@", "e" );
-ToFile( "SAMPLEICC_LIBS", "@SAMPLEICC_LIBS@", "e" );
 ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
-ToFile( "DBUS_CFLAGS",       "@DBUS_CFLAGS@",      "e" );
-ToFile( "DBUS_LIBS",         "@DBUS_LIBS@",        "e" );
-ToFile( "GTK_PRINT_CFLAGS",  "@GTK_PRINT_CFLAGS@",  "e" );
-ToFile( "GTK_PRINT_LIBS",    "@GTK_PRINT_LIBS@",    "e" );
-ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
-ToFile( "KDE_LIBS",          "@KDE_LIBS@",         "e" );
 ToFile( "MOC",               "@MOC@",              "e" );
-ToFile( "KDE4_CFLAGS",       "@KDE4_CFLAGS@",      "e" );
-ToFile( "KDE4_LIBS",         "@KDE4_LIBS@",        "e" );
 ToFile( "MOC4",              "@MOC4@",             "e" );
-ToFile( "KDE_GLIB_CFLAGS",   "@KDE_GLIB_CFLAGS@",  "e" );
-ToFile( "KDE_GLIB_LIBS",     "@KDE_GLIB_LIBS@",    "e" );
 ToFile( "KDE_HAVE_GLIB",     "@KDE_HAVE_GLIB@",    "e" );
 ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
@@ -1467,8 +1447,6 @@ ToFile( "GUI",               $GUI,               "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
 ToFile( "OS",                $OS,                "e" );
 ToFile( "OSVERSION",         $OSVERSION,         "e" );
-ToFile( "PTHREAD_CFLAGS",    "@PTHREAD_CFLAGS@", "e" );
-ToFile( "PTHREAD_LIBS",      "@PTHREAD_LIBS@",   "e" );
 ToFile( "OUTPATH",           $OUTPATH,           "e" );
 ToFile( "INPATH",            $INPATH,            "e" );
 ToFile( "PATH_SEPERATOR",    $PATH_SEPERATOR,    "e" );
@@ -1683,11 +1661,6 @@ ToFile( "WITH_STLPORT",      "@WITH_STLPORT@", "e" );
 ToFile( "ALLOC",             "@ALLOC@",          "e" );
 ToFile( "DISABLE_LINKOO",    "@DISABLE_LINKOO@",    "e" );
 ToFile( "DISABLE_STRIP",     "@DISABLE_STRIP@",     "e" );
-ToFile( "LFS_CFLAGS",        "@LFS_CFLAGS@",     "e" );
-ToFile( "FONTCONFIG_LIBS",   "@FONTCONFIG_LIBS@",   "e");
-ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e");
-ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
-ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
 ToFile( "CL_X64",            "@CL_X64@",            "e");
 ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
 ToFile( "DICT_SYSTEM_DIR",   "@DICT_SYSTEM_DIR@",  "e");
@@ -1698,12 +1671,9 @@ ToFile( "WITH_OPENLDAP",     "@WITH_OPENLDAP@",    "e" );
 ToFile( "WITH_MOZILLA",      "@WITH_MOZILLA@",     "e" );
 ToFile( "SYSTEM_MOZILLA",    "@SYSTEM_MOZILLA@",   "e" );
 ToFile( "MOZ_FLAVOUR",       "@MOZ_FLAVOUR@",      "e" );
-ToFile( "NSS_LIBS",          "@NSS_LIBS@",         "e" );
-ToFile( "NSS_CFLAGS",        "@NSS_CFLAGS@",       "e" );
 ToFile( "MOZ_INC",           "@MOZ_INC@",          "e" );
 ToFile( "MOZ_LIB",           "@MOZ_LIB@",          "e" );
 ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
-ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
 ToFile( "OOOP_GALLERY_PACK", "@OOOP_GALLERY_PACK@","e" );
 ToFile( "OOOP_TEMPLATES_PACK", "@OOOP_TEMPLATES_PACK@","e" );
 ToFile( "OOOP_FONTS_PACK",   "@OOOP_FONTS_PACK@","e" );
@@ -1732,8 +1702,6 @@ ToFile( "WITH_BINFILTER",    "@WITH_BINFILTER@",   "e" );
 ToFile( "BUILD_TYPE",        "$BUILD_TYPE",       "e" );
 ToFile( "MINGW_EXTERNAL_DLLS","@MINGW_EXTERNAL_DLLS@","e");
 ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
-ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );
-ToFile( "GOBJECT_LIBS",      "@GOBJECT_LIBS@",     "e" );
 if ( '@ENABLE_RPATH@' eq "no" ) {
   ToFile( "LINKFLAGSRUNPATH",'',                   "e" );
 }
@@ -1742,47 +1710,15 @@ ToFile( "EPM_FLAGS",         $EPM_FLAGS,           "e" );
 ToFile( "BUILD_EPM",         "@BUILD_EPM@",        "e" );
 ToFile( "GPERF",             "@GPERF@",            "e" );
 ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
-ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
-ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
 ToFile( "DISABLE_PYTHON",    "@DISABLE_PYTHON@",   "e" );
 ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
 ToFile( "PYTHON",            "@PYTHON@",           "e" );
-ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
-ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
 ToFile( "ICU_MAJOR",         "@ICU_MAJOR@",        "e" );
 ToFile( "ICU_MINOR",         "@ICU_MINOR@",        "e" );
 ToFile( "ICU_MICRO",         "@ICU_MICRO@",        "e" );
 ToFile( "ICU_RECLASSIFIED_CLOSE_PARENTHESIS", "@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@", "e" );
-ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
-ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
-ToFile( "POPPLER_CFLAGS",    "@POPPLER_CFLAGS@",   "e" );
-ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
-ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
-ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
-ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
-ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
-ToFile( "XRANDR_CFLAGS",     "@XRANDR_CFLAGS@",    "e" );
-ToFile( "XRANDR_LIBS",       "@XRANDR_LIBS@",      "e" );
 ToFile( "XRANDR_DLOPEN",     "@XRANDR_DLOPEN@",    "e" );
-ToFile( "LIBPNG_CFLAGS",     "@LIBPNG_CFLAGS@",    "e" );
-ToFile( "LIBPNG_LIBS",       "@LIBPNG_LIBS@",      "e" );
-ToFile( "WPD_CFLAGS",        "@WPD_CFLAGS@",    "e" );
-ToFile( "WPD_LIBS",          "@WPD_LIBS@",      "e" );
-ToFile( "WPS_CFLAGS",        "@WPS_CFLAGS@",    "e" );
-ToFile( "WPS_LIBS",          "@WPS_LIBS@",      "e" );
-ToFile( "WPG_CFLAGS",        "@WPG_CFLAGS@",    "e" );
-ToFile( "WPG_LIBS",          "@WPG_LIBS@",      "e" );
-ToFile( "VISIO_CFLAGS",      "@VISIO_CFLAGS@",  "e" );
-ToFile( "VISIO_LIBS",        "@VISIO_LIBS@",    "e" );
-ToFile( "CDR_CFLAGS",        "@CDR_CFLAGS@",  "e" );
-ToFile( "CDR_LIBS",          "@CDR_LIBS@",    "e" );
-ToFile( "LIBCMIS_CFLAGS",    "@LIBCMIS_CFLAGS@",  "e" );
-ToFile( "LIBCMIS_LIBS",      "@LIBCMIS_LIBS@",    "e" );
-ToFile( "CPPUNIT_CFLAGS",    "@CPPUNIT_CFLAGS@",   "e" );
-ToFile( "CPPUNIT_LIBS",      "@CPPUNIT_LIBS@",     "e" );
 ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
-ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
-ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
 ToFile( "WITH_EXTRA_GALLERY","@WITH_EXTRA_GALLERY@",      "e" );
 ToFile( "WITH_EXTRA_TEMPLATE","@WITH_EXTRA_TEMPLATE@",      "e" );
 ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@",      "e" );
@@ -1790,8 +1726,6 @@ ToFile( "WITH_EXTRA_FONT",   "@WITH_EXTRA_FONT@",      "e" );
 ToFile( "OXYGENOFFICE_PACK","@OXYGENOFFICE_PACK@","e" );
 ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
 ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
-ToFile( "DBUSMENUGTK_CFLAGS",  "@DBUSMENUGTK_CFLAGS@", "e" );
-ToFile( "DBUSMENUGTK_LIBS",  "@DBUSMENUGTK_LIBS@", "e" );
 ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
 ToFile( "MYSQL_LIB",         "@MYSQL_LIB@",        "e" );
 ToFile( "MYSQL_DEFINES",     "@MYSQL_DEFINES@",    "e" );
@@ -1802,38 +1736,22 @@ 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( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );
-ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
 ToFile( "XSLTPROC",          "@XSLTPROC@",         "e" );
-ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
-ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );
-ToFile( "MDDS_CPPFLAGS",     "@MDDS_CPPFLAGS@",     "e" );
 ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
-ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
-ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
-ToFile( "DISABLE_NEON",      "@DISABLE_NEON@",     "e" );
 ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
 ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
 ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
-ToFile( "REDLAND_CFLAGS",    "@REDLAND_CFLAGS@",   "e" );
-ToFile( "REDLAND_LIBS",      "@REDLAND_LIBS@",     "e" );
 ToFile( "WITH_KRB5",         "@WITH_KRB5@",        "e" );
 ToFile( "WITH_GSSAPI",       "@WITH_GSSAPI@",      "e" );
 ToFile( "BUILD_POSTGRESQL_SDBC",   "@BUILD_POSTGRESQL_SDBC@", "e" );
 ToFile( "POSTGRESQL_INC",    "@POSTGRESQL_INC@",   "e" );
 ToFile( "POSTGRESQL_LIB",    "@POSTGRESQL_LIB@",   "e" );
-ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
-ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
 ToFile( "HAVE_GETOPT",       "@HAVE_GETOPT@",      "e" );
 ToFile( "HAVE_READDIR_R",    "@HAVE_READDIR_R@",   "e" );
 ToFile( "HAVE_POSIX_FALLOCATE",    "@HAVE_POSIX_FALLOCATE@",   "e" );
 ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
-ToFile( "MYTHES_CFLAGS",     "@MYTHES_CFLAGS@",    "e" );
-ToFile( "MYTHES_LIBS",       "@MYTHES_LIBS@",      "e" );
-ToFile( "LIBEXTTEXTCAT_CFLAGS", "@LIBEXTTEXTCAT_CFLAGS@", "e" );
-ToFile( "LIBEXTTEXTCAT_LIBS", "@LIBEXTTEXTCAT_LIBS@", "e" );
 ToFile( "GXX_INCLUDE_PATH",  PathFormat("@GXX_INCLUDE_PATH@"), "e" );
 ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );
 ToFile( "MERGELIBS",         "@MERGELIBS@",           "e" );