diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-16 16:10:34 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-16 16:55:43 +0200 |
| commit | 2ca1021168f418a5da9941a3caa0ac2e96587ea6 (patch) | |
| tree | e8a1c5e4e69f3a0b20b76146627f28537f14f054 | |
| parent | 3ba1c8e297af0e66eaf40ff1d33e1c1087efa685 (diff) | |
| download | NetworkManager-2ca1021168f418a5da9941a3caa0ac2e96587ea6.tar.gz | |
systemd/build: split CPPFLAGS to only include needed paths
Optimally, we only make use of systemd API that is intended to be public
and that will be later part of the system-library. That is currently
not yet possible and we need "-Isrc/systemd/src/basic" to build
"nm-dhcp-systemd.h". Still, split the include paths to build systemd
code itself, contrary to the user of the API.
| -rw-r--r-- | src/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 61e4c2a4a2..9d1cb310c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,14 +55,11 @@ noinst_LTLIBRARIES = \ # libsystemd-nm ###################### -SYSTEMD_NM_CFLAGS = \ +SYSTEMD_NM_CFLAGS_PATHS = \ -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/src/shared \ - -I$(top_srcdir)/src/systemd \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core + -I$(top_srcdir)/src/systemd libsystemd_nm_la_SOURCES = \ systemd/nm-sd-adapt.c \ @@ -133,7 +130,10 @@ libsystemd_nm_la_SOURCES = \ libsystemd_nm_la_CPPFLAGS = \ -I$(top_srcdir)/include \ - $(SYSTEMD_NM_CFLAGS) \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + $(SYSTEMD_NM_CFLAGS_PATHS) \ + -I$(top_srcdir)/src/systemd/src/shared \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ $(GLIB_CFLAGS) @@ -398,7 +398,7 @@ AM_CPPFLAGS += \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ - $(SYSTEMD_NM_CFLAGS) \ + $(SYSTEMD_NM_CFLAGS_PATHS) \ \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ |