mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
meson: add tools directory
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
parent
33ed543160
commit
839b75492b
@ -2223,6 +2223,8 @@ subdir('include')
|
|||||||
|
|
||||||
subdir('src')
|
subdir('src')
|
||||||
|
|
||||||
|
subdir('tools')
|
||||||
|
|
||||||
|
|
||||||
# generate meson-config.h file
|
# generate meson-config.h file
|
||||||
configure_file(output: 'meson-config.h', configuration: conf)
|
configure_file(output: 'meson-config.h', configuration: conf)
|
||||||
|
@ -15,32 +15,12 @@
|
|||||||
## License along with this library. If not, see
|
## License along with this library. If not, see
|
||||||
## <http://www.gnu.org/licenses/>.
|
## <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
|
||||||
-I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
||||||
-I$(top_builddir)/src -I$(top_srcdir)/src \
|
|
||||||
-I$(top_srcdir)/src/util \
|
|
||||||
-I$(top_srcdir) \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
# We do not want to accidentally include stuff from src/
|
# We do not want to accidentally include stuff from src/
|
||||||
# dir or public API dir. Specific files can
|
# dir or public API dir. Specific files can
|
||||||
# still be included via their path relative to the root if
|
# still be included via their path relative to the root if
|
||||||
# needed
|
# needed
|
||||||
STANDALONE_CPPFLAGS = -I$(top_srcdir)
|
STANDALONE_CPPFLAGS = -I$(top_srcdir)
|
||||||
|
|
||||||
AM_CFLAGS = \
|
|
||||||
$(WARN_CFLAGS) \
|
|
||||||
$(COVERAGE_CFLAGS) \
|
|
||||||
$(LIBXML_CFLAGS) \
|
|
||||||
$(GLIB_CFLAGS) \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
AM_LDFLAGS = \
|
|
||||||
$(RELRO_LDFLAGS) \
|
|
||||||
$(NO_INDIRECT_LDFLAGS) \
|
|
||||||
$(NO_UNDEFINED_LDFLAGS) \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
ICON_FILES = \
|
ICON_FILES = \
|
||||||
libvirt_win_icon_16x16.ico \
|
libvirt_win_icon_16x16.ico \
|
||||||
libvirt_win_icon_32x32.ico \
|
libvirt_win_icon_32x32.ico \
|
||||||
|
20
tools/meson.build
Normal file
20
tools/meson.build
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
tools_inc_dir = include_directories('.')
|
||||||
|
|
||||||
|
tools_dep = declare_dependency(
|
||||||
|
compile_args: coverage_flags,
|
||||||
|
dependencies: [
|
||||||
|
libxml_dep,
|
||||||
|
glib_dep,
|
||||||
|
],
|
||||||
|
include_directories: [
|
||||||
|
libvirt_inc,
|
||||||
|
src_inc_dir,
|
||||||
|
util_inc_dir,
|
||||||
|
top_inc_dir,
|
||||||
|
],
|
||||||
|
link_args: (
|
||||||
|
libvirt_relro
|
||||||
|
+ libvirt_no_indirect
|
||||||
|
+ libvirt_no_undefined
|
||||||
|
),
|
||||||
|
)
|
Loading…
Reference in New Issue
Block a user