eal: move common header files

[dpdk.git] / kernel / linux / kni / meson.build

diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index a09af5a..706bea5 100644 (file)
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -1,34 +1,28 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
-subdir('ethtool')
-
 kni_mkfile = custom_target('rte_kni_makefile',
        output: 'Makefile',
        command: ['touch', '@OUTPUT@'])
 
 kni_sources = files(
-       'kni_ethtool.c',
        'kni_misc.c',
        'kni_net.c',
        'Kbuild')
 
 custom_target('rte_kni',
-       input: kni_sources + kni_igb_sources + kni_ixgbe_sources,
+       input: kni_sources,
        output: 'rte_kni.ko',
-       command: ['make', '-j4', '-C', kernel_dir,
+       command: ['make', '-j4', '-C', kernel_dir + '/build',
                'M=' + meson.current_build_dir(),
                'src=' + meson.current_source_dir(),
                'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
-               ' -I' + meson.source_root() + '/lib/librte_eal/common/include' +
-               ' -I' + meson.source_root() + '/lib/librte_eal/linuxapp/eal/include' +
+               ' -I' + meson.source_root() + '/lib/librte_eal/include' +
+               ' -I' + meson.source_root() + '/lib/librte_eal/linux/eal/include' +
                ' -I' + meson.build_root() +
-               ' -I' + meson.current_source_dir() +
-               ' -I' + meson.current_source_dir() + '/ethtool/ixgbe' +
-               ' -I' + meson.current_source_dir() + '/ethtool/igb',
+               ' -I' + meson.current_source_dir(),
                'modules'],
        depends: kni_mkfile,
-       console: true,
        install: true,
-       install_dir: kernel_dir + '/../extra/dpdk',
+       install_dir: kernel_dir + '/extra/dpdk',
        build_by_default: get_option('enable_kmods'))