colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove "shared/" from include search path

Browse Source 
There is nothing left there.
This commit is contained in:
Thomas Haller
2021-02-24 08:58:49 +01:00
parent d6681a0429
commit 635d84b896
14 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.am
View File

@@ -354,7 +354,6 @@ noinst_LTLIBRARIES += src/libnm-std-aux/libnm-std-aux.la
src_libnm_std_aux_libnm_std_aux_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(CODE_COVERAGE_CFLAGS) \
@@ -385,7 +384,6 @@ EXTRA_DIST += src/libnm-std-aux/meson.build
src_libnm_glib_aux_cppflags = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(CODE_COVERAGE_CFLAGS) \
@@ -515,7 +513,6 @@ noinst_LTLIBRARIES += src/libnm-log-core/libnm-log-core.la
src_libnm_log_core_libnm_log_core_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(CODE_COVERAGE_CFLAGS) \
@@ -545,7 +542,6 @@ noinst_LTLIBRARIES += src/libnm-log-null/libnm-log-null.la
src_libnm_log_null_libnm_log_null_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(CODE_COVERAGE_CFLAGS) \
@@ -601,7 +597,6 @@ check_programs += src/libnm-platform/tests/test-nm-platform
src_libnm_platform_tests_test_nm_platform_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(CODE_COVERAGE_CFLAGS) \
@@ -635,7 +630,6 @@ noinst_LTLIBRARIES += src/libnm-core-aux-intern/libnm-core-aux-intern.la
src_libnm_core_aux_intern_libnm_core_aux_intern_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/src \
-I$(srcdir)/src \
-I$(builddir)/src/libnm-core-public \
@@ -675,7 +669,6 @@ noinst_LTLIBRARIES += src/libnm-core-aux-extern/libnm-core-aux-extern.la
src_libnm_core_aux_extern_libnm_core_aux_extern_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/src/libnm-core-public \
-I$(srcdir)/src/libnm-core-public \
-I$(srcdir)/src \
@@ -712,7 +705,6 @@ noinst_LTLIBRARIES += src/libnm-client-aux-extern/libnm-client-aux-extern.la
src_libnm_client_aux_extern_libnm_client_aux_extern_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/src/libnm-core-public \
@@ -753,8 +745,6 @@ noinst_LTLIBRARIES += src/libnm-client-test/libnm-client-test.la
src_libnm_client_test_libnm_client_test_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/src/libnm-core-public \
@@ -798,7 +788,6 @@ check_programs += src/libnm-glib-aux/tests/test-shared-general
src_libnm_glib_aux_tests_test_shared_general_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(CODE_COVERAGE_CFLAGS) \
@@ -827,7 +816,6 @@ check_programs += src/libnm-glib-aux/tests/test-json-aux
src_libnm_glib_aux_tests_test_json_aux_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(CODE_COVERAGE_CFLAGS) \
@@ -1280,7 +1268,6 @@ EXTRA_DIST += \
dflt_cppflags_libnm_core = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/src/libnm-core-public \
-I$(srcdir)/src/libnm-core-public \
-I$(srcdir)/src \
@@ -2024,7 +2011,6 @@ check_local += check-config-options
libsystemd_cppflags = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src/ \
-I$(builddir)/src/ \
-I$(srcdir)/src/libnm-systemd-shared/ \
@@ -3035,7 +3021,6 @@ libexec_PROGRAMS += src/core/dhcp/nm-dhcp-helper
src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
$(GLIB_CFLAGS) \
@@ -3096,7 +3081,6 @@ pppd_plugin_LTLIBRARIES += src/core/ppp/nm-pppd-plugin.la
src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/src/libnm-core-public \
@@ -4429,7 +4413,6 @@ noinst_LTLIBRARIES += \
dispatcher_cppflags = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/dispatcher \
-I$(srcdir)/dispatcher \
-I$(builddir)/src/libnm-core-public \
@@ -4510,7 +4493,6 @@ check_programs += dispatcher/tests/test-dispatcher-envp
dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/dispatcher \
-I$(builddir)/dispatcher \
-I$(builddir)/src/libnm-core-public \
@@ -4567,7 +4549,6 @@ bin_PROGRAMS += clients/nm-online
clients_nm_online_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/src/libnm-core-public \
@@ -4603,7 +4584,6 @@ EXTRA_DIST += \
clients_cppflags = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/clients/common \
-I$(srcdir)/clients/common \
-I$(builddir)/src/libnm-core-public \
@@ -4739,8 +4719,6 @@ check_programs += clients/common/tests/test-libnm-core-aux
clients_common_tests_test_libnm_core_aux_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/src/libnm-core-public \
-I$(builddir)/src/libnm-core-public \
-I$(srcdir)/src/libnm-client-public \

3
shared/meson.build
View File

@@ -1,10 +1,7 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
shared_inc = include_directories('.')
glib_nm_default_dep = declare_dependency(
include_directories: [
shared_inc,
top_inc,
],
dependencies: [

2
src/core/meson.build
View File

@@ -6,7 +6,6 @@ core_plugin_dep = declare_dependency(
include_directories: [
src_core_inc,
top_inc,
shared_inc,
libnm_core_public_inc,
],
dependencies: [
@@ -19,7 +18,6 @@ core_plugin_dep = declare_dependency(
core_default_dep = declare_dependency(
include_directories: [
src_core_inc,
shared_inc,
src_inc,
top_inc,
],

2
src/core/systemd/meson.build
View File

@@ -40,7 +40,6 @@ libnm_systemd_core = static_library(
incs,
src_inc,
src_core_inc,
shared_inc,
],
dependencies: [
glib_nm_default_dep,
@@ -53,7 +52,6 @@ libnm_systemd_core = static_library(
libnm_systemd_core_dep = declare_dependency(
include_directories: [
incs,
shared_inc,
],
dependencies: [
glib_dep,

2
src/libnm-base/meson.build
View File

@@ -3,7 +3,6 @@
libnm_base = static_library(
'nm-base',
include_directories: [
shared_inc,
src_inc,
top_inc,
],
@@ -14,7 +13,6 @@ libnm_base = static_library(
)
libnm_base_dep = declare_dependency(
include_directories: shared_inc,
dependencies: libnm_glib_aux_dep,
)

1
src/libnm-client-aux-extern/meson.build
View File

@@ -12,6 +12,5 @@ libnm_client_aux_extern = static_library(
)
libnm_client_aux_extern_dep = declare_dependency(
include_directories: [shared_inc],
link_with: [libnm_client_aux_extern],
)

1
src/libnm-client-impl/meson.build
View File

@@ -5,7 +5,6 @@ libnm_nm_default_dep = declare_dependency(
libnm_client_public_inc,
libnm_core_public_inc,
top_inc,
shared_inc,
src_inc,
],
dependencies: [

1
src/libnm-core-aux-intern/meson.build
View File

@@ -15,7 +15,6 @@ libnm_core_aux_intern = static_library(
libnm_core_aux_intern_dep = declare_dependency(
include_directories: [
shared_inc,
src_inc,
top_inc,
],

2
src/libnm-glib-aux/meson.build
View File

@@ -19,7 +19,6 @@ libnm_glib_aux = static_library(
'nm-time-utils.c',
),
include_directories: [
shared_inc,
src_inc,
top_inc,
],
@@ -32,7 +31,6 @@ libnm_glib_aux = static_library(
libnm_glib_aux_dep = declare_dependency(
include_directories: [
shared_inc,
src_inc,
top_inc,
],

2
src/libnm-log-core/meson.build
View File

@@ -4,7 +4,6 @@ libnm_log_core = static_library(
'nm-log-core',
sources: 'nm-logging.c',
include_directories: [
shared_inc,
src_inc,
top_inc,
],
@@ -15,7 +14,6 @@ libnm_log_core = static_library(
)
libnm_log_core_dep = declare_dependency(
include_directories: shared_inc,
dependencies: [
libnm_glib_aux_dep_link,
],

1
src/libnm-log-null/meson.build
View File

@@ -4,7 +4,6 @@ libnm_log_null = static_library(
'nm-log-null',
sources: 'nm-logging-null.c',
include_directories: [
shared_inc,
src_inc,
top_inc,
],

1
src/libnm-std-aux/meson.build
View File

@@ -7,7 +7,6 @@ libnm_std_aux = static_library(
'nm-std-utils.c',
],
include_directories: [
shared_inc,
src_inc,
top_inc,
],

2
src/libnm-udev-aux/meson.build
View File

@@ -4,7 +4,6 @@ libnm_udev_aux = static_library(
'nm-udev-aux',
sources: 'nm-udev-utils.c',
include_directories: [
shared_inc,
src_inc,
top_inc,
],
@@ -15,6 +14,5 @@ libnm_udev_aux = static_library(
)
libnm_udev_aux_dep = declare_dependency(
include_directories: shared_inc,
link_with: libnm_udev_aux,
)

2
src/meson.build
View File

@@ -52,7 +52,6 @@ libn_acd = static_library(
)
libn_acd_dep = declare_dependency(
include_directories: shared_inc,
link_with: libn_acd,
)
@@ -84,7 +83,6 @@ libn_dhcp4 = static_library(
)
libn_dhcp4_dep = declare_dependency(
include_directories: shared_inc,
link_with: libn_dhcp4,
)