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

systemd: cleanup systemd's include paths in src/Makefile.am

Browse Source 
Certain systemd include paths are internal and should not be added
to the include paths when compiling non-systemd sources.
This commit is contained in:
Thomas Haller
2016-08-11 17:41:59 +02:00
parent f5a4a7e007
commit f956d2e3ef
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Makefile.am
View File

@@ -32,13 +32,6 @@ SUBDIRS += \
tests
endif
SYSTEMD_NM_CFLAGS_PATHS = \
-I$(top_srcdir)/src/systemd/sd-adapt/ \
-I$(top_srcdir)/src/systemd/src/systemd \
-I$(top_srcdir)/src/systemd/src/libsystemd-network \
-I$(top_srcdir)/src/systemd/src/basic \
-I$(top_srcdir)/src/systemd
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
@@ -81,9 +74,11 @@ AM_CPPFLAGS = \
$(LIBAUDIT_CFLAGS) \
$(SYSTEMD_LOGIN_CFLAGS) \
$(SYSTEMD_JOURNAL_CFLAGS) \
$(SYSTEMD_NM_CFLAGS_PATHS) \
$(CODE_COVERAGE_CFLAGS) \
\
-I$(top_srcdir)/src/systemd/src/systemd/ \
-I$(top_srcdir)/src/systemd/ \
\
$(NULL)
AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
@@ -241,8 +236,11 @@ libsystemd_nm_la_CPPFLAGS = \
-I$(top_builddir)/shared/ \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
$(SYSTEMD_NM_CFLAGS_PATHS) \
-I$(top_srcdir)/src/systemd/src/shared \
-I$(top_srcdir)/src/systemd/sd-adapt/ \
-I$(top_srcdir)/src/systemd/src/systemd/ \
-I$(top_srcdir)/src/systemd/src/basic/ \
-I$(top_srcdir)/src/systemd/src/shared/ \
-I$(top_srcdir)/src/systemd/src/libsystemd-network/ \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
$(GLIB_CFLAGS)