Remove USE_YQL() macro and extra deps from YQL_UDF_STATIC.
@@ -1900,14 +1900,23 @@ otherwise {
YQL_UDF_LINK_PRG_CMD=$LINK_EXEC_DYN_LIB && ${tool:"yql/tools/udf_probe"} $TARGET ${kv;hide:"p UD"}
}
+### @usage: _ADD_YQL_UDF_DEPS()
+###
+### Add all needed PEERDIRs to a YQL_UDF.
+###
+### https://yql.yandex-team.ru/docs/yt/udf/cpp/
+macro _ADD_YQL_UDF_DEPS() {
+ PEERDIR(yql/library/udf)
+ PEERDIR(yql/library/udf/support)
+}
+
### @usage: _MAKE_YQL_UDF()
###
### Make module definition an YQL UDF: add all needed dependencies, properties and flags
###
### https://yql.yandex-team.ru/docs/yt/udf/cpp/
macro _MAKE_YQL_UDF() {
- PEERDIR(yql/library/udf)
- PEERDIR(yql/library/udf/support)
+ _ADD_YQL_UDF_DEPS()
SET_APPEND(USER_CXXFLAGS -DBUILD_UDF)
# For Windows using declspecs
DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/yql/library/udf/udfs_exports.exports)
@@ -1934,16 +1943,6 @@ module _YQL_UDF_PROGRAM_BASE: SO_PROGRAM {
_MAKE_YQL_UDF()
}
-### @usage USE_YQL()
-###
-### Add required PEERDIRs for YQL module.
-### Can be used for in-place module definition in user LIBRARY.
-macro USE_YQL() {
- PEERDIR(yql/library/udf)
- PEERDIR(yql/library/udf/support)
- PEERDIR(yql/library/udf/service/terminate_policy)
-}
-
### @usage: GLOBAL_SRCS(filenames...)
###
### Make all source files listed as GLOBAL.
@@ -2004,7 +2003,7 @@ multimodule YQL_UDF {
module YQL_UDF_STATIC: _DLL_COMPATIBLE_LIBRARY {
.ALIASES=SRCS=GLOBAL_SRCS
OBJ_SUF=.udfs
- USE_YQL()
+ _ADD_YQL_UDF_DEPS()
when ($MSVC == "yes" || $CYGWIN == "yes") {
MODULE_SUFFIX=.static.lib
}
