From f956d2e3ef01f3f61b272851aac3d6cd02e32e81 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 11 Aug 2016 17:41:59 +0200 Subject: [PATCH] systemd: cleanup systemd's include paths in src/Makefile.am Certain systemd include paths are internal and should not be added to the include paths when compiling non-systemd sources. --- src/Makefile.am | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 039e2c044..bc7ca33f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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)