From 453de72591a4bb45d0907b234b9f88272b38f8a1 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sun, 26 Nov 2017 20:51:33 +0300
Subject: Set cc.poptions for directory scopes

---
 mysql/buildfile | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'mysql')

diff --git a/mysql/buildfile b/mysql/buildfile
index 7efa207..f3f5339 100644
--- a/mysql/buildfile
+++ b/mysql/buildfile
@@ -145,9 +145,9 @@ mysys_poptions   = "-I$src_base/mysys"
 # To keep "-I$out_root" "-I$src_root" first we use '+=', rather than '=+' to
 # append poptions for the target wildcards.
 #
-   zlib/obj{*}: cc.poptions += $zlib_poptions
-  mysys/obj{*}: cc.poptions += $mysys_poptions $zlib_poptions
-strings/obj{*}: cc.poptions += $strings_poptions -DDISABLE_MYSQL_THREAD_H
+   zlib/: cc.poptions += $zlib_poptions
+  mysys/: cc.poptions += $mysys_poptions $zlib_poptions
+strings/: cc.poptions += $strings_poptions -DDISABLE_MYSQL_THREAD_H
 
 yassl_dir    = $src_base/extra/yassl
 taocrypt_dir = $yassl_dir/taocrypt
@@ -156,17 +156,19 @@ taocrypt_poptions = "-I$taocrypt_dir/include" "-I$taocrypt_dir/mySTL" \
                     -DHAVE_YASSL -DYASSL_PREFIX -DHAVE_OPENSSL        \
                     -DMULTI_THREADED
 
-extra/yassl/taocrypt/src/obj{*}: cc.poptions += $taocrypt_poptions
-
 yassl_poptions = "-I$yassl_dir/include" $taocrypt_poptions
 
-extra/yassl/src/obj{*}:                                                  \
+extra/yassl/:
+{
+  taocrypt/: cc.poptions += $taocrypt_poptions
+
   cc.poptions += -Dget_tty_password=yassl_mysql_get_tty_password         \
                  -Dget_tty_password_ext=yassl_mysql_get_tty_password_ext \
                  $yassl_poptions
+}
 
-      vio/obj{*}: cc.poptions += "-I$src_base" $yassl_poptions
-mysys_ssl/obj{*}: cc.poptions += "-I$src_base" $yassl_poptions $mysys_poptions
+      vio/: cc.poptions += "-I$src_base" $yassl_poptions
+mysys_ssl/: cc.poptions += "-I$src_base" $yassl_poptions $mysys_poptions
 
 # The CLIENT_PROTOCOL_TRACING macro seems to be required for debugging only.
 # However, the compilation falls apart if undefined, so we keep it.
@@ -178,15 +180,15 @@ sql_poptions = "-I$src_base/sql" "-I$src_base/libmysql"         \
 if ($tclass == 'windows')
   sql_poptions += -DAUTHENTICATION_WIN
 
-sql/obj{*}:        cc.poptions += $sql_poptions
-sql-common/obj{*}: cc.poptions += $sql_poptions
-libmysql/obj{*}:   cc.poptions += $sql_poptions
+sql/:        cc.poptions += $sql_poptions
+sql-common/: cc.poptions += $sql_poptions
+libmysql/:   cc.poptions += $sql_poptions
 
 # The upstream package always adds -DDEBUG_ERRROR_LOG -DWINAUTH_USE_DBUG_LIB.
 # Looks like they are required for debugging only, so let's omit them.
 #
 if ($tclass == 'windows')
-  libmysql/authentication_win/obj{*}: cc.poptions += -DSECURITY_WIN32
+  libmysql/authentication_win/: cc.poptions += -DSECURITY_WIN32
 
 if ($tsys == 'win32-msvc')
 {
-- 
cgit v1.1