Git fork

meson: inline the static 'git' library

When setting up `libgit.a` we first create the static library itself,
and then declare it as part of a dependency such that compile arguments,
include directories and transitive dependencies get propagated to the
users of that library. As such, the static library isn't expected to be
used by anything but the declared dependency.

Inline the static library so that we don't even use a separate variable
for it. This avoids any kind of confusion that may arise and clarifies
how the library is supposed to be used.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Patrick Steinhardt and committed by
Junio C Hamano
ce943288 61283010

+7 -9
+7 -9
meson.build
··· 1555 1555 include_directories: libgit_include_directories, 1556 1556 ) 1557 1557 1558 - libgit_library = static_library('git', 1559 - sources: libgit_sources, 1560 - c_args: libgit_c_args, 1561 - link_with: libgit_version_library, 1562 - dependencies: libgit_dependencies, 1563 - include_directories: libgit_include_directories, 1564 - ) 1565 - 1566 1558 libgit = declare_dependency( 1559 + link_with: static_library('git', 1560 + sources: libgit_sources, 1561 + c_args: libgit_c_args, 1562 + link_with: libgit_version_library, 1563 + dependencies: libgit_dependencies, 1564 + include_directories: libgit_include_directories, 1565 + ), 1567 1566 compile_args: libgit_c_args, 1568 - link_with: libgit_library, 1569 1567 dependencies: libgit_dependencies, 1570 1568 include_directories: libgit_include_directories, 1571 1569 )