directory_if_unix, etc.

This commit is contained in:
David Rose 2002-04-11 17:19:44 +00:00
parent b553673718
commit ec96e3d6b3
2 changed files with 41 additions and 34 deletions

View File

@ -245,6 +245,8 @@
// or false (empty) when the directory is not to be built. // or false (empty) when the directory is not to be built.
#defer build_directory \ #defer build_directory \
$[and \ $[and \
$[or $[not $[DIRECTORY_IF_WINDOWS]],$[WINDOWS_PLATFORM]], \
$[or $[not $[DIRECTORY_IF_UNIX]],$[UNIX_PLATFORM]], \
$[or $[not $[DIRECTORY_IF_PYTHON]],$[HAVE_PYTHON]], \ $[or $[not $[DIRECTORY_IF_PYTHON]],$[HAVE_PYTHON]], \
$[or $[not $[DIRECTORY_IF_NSPR]],$[HAVE_NSPR]], \ $[or $[not $[DIRECTORY_IF_NSPR]],$[HAVE_NSPR]], \
$[or $[not $[DIRECTORY_IF_CRYPTO]],$[HAVE_CRYPTO]], \ $[or $[not $[DIRECTORY_IF_CRYPTO]],$[HAVE_CRYPTO]], \
@ -277,6 +279,8 @@
// the target is not to be built. // the target is not to be built.
#defer build_target \ #defer build_target \
$[and \ $[and \
$[or $[not $[TARGET_IF_WINDOWS]],$[WINDOWS_PLATFORM]], \
$[or $[not $[TARGET_IF_UNIX]],$[UNIX_PLATFORM]], \
$[or $[not $[TARGET_IF_PYTHON]],$[HAVE_PYTHON]], \ $[or $[not $[TARGET_IF_PYTHON]],$[HAVE_PYTHON]], \
$[or $[not $[TARGET_IF_NSPR]],$[HAVE_NSPR]], \ $[or $[not $[TARGET_IF_NSPR]],$[HAVE_NSPR]], \
$[or $[not $[TARGET_IF_CRYPTO]],$[HAVE_CRYPTO]], \ $[or $[not $[TARGET_IF_CRYPTO]],$[HAVE_CRYPTO]], \

View File

@ -38,6 +38,7 @@
// $[bin_targets] the list of binaries. $[test_bin_targets] is the // $[bin_targets] the list of binaries. $[test_bin_targets] is the
// list of binaries that are to be built only when specifically asked // list of binaries that are to be built only when specifically asked
// for. // for.
#if $[build_directory]
#define lib_targets $[active_target(metalib_target lib_target ss_lib_target noinst_lib_target):%=$[so_dir]/lib%.so] #define lib_targets $[active_target(metalib_target lib_target ss_lib_target noinst_lib_target):%=$[so_dir]/lib%.so]
#define static_lib_targets $[active_target(static_lib_target):%=$[st_dir]/lib%.a] #define static_lib_targets $[active_target(static_lib_target):%=$[st_dir]/lib%.a]
#define bin_targets $[active_target(bin_target noinst_bin_target sed_bin_target):%=$[st_dir]/%] #define bin_targets $[active_target(bin_target noinst_bin_target sed_bin_target):%=$[st_dir]/%]
@ -75,6 +76,8 @@
#set so_sources #set so_sources
#endif #endif
#endif // $[build_directory]
// And these are the various source files, extracted out by type. // And these are the various source files, extracted out by type.
#define cxx_so_sources $[filter_out %_src.cxx,$[filter %.cxx,$[so_sources]]] #define cxx_so_sources $[filter_out %_src.cxx,$[filter %.cxx,$[so_sources]]]
#define cxx_st_sources $[filter_out %_src.cxx,$[filter %.cxx,$[st_sources]]] #define cxx_st_sources $[filter_out %_src.cxx,$[filter %.cxx,$[st_sources]]]