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:10:34 +0200 |
| commit | 4511f458308219ae940520dd6c324abcfd6403d6 (patch) | |
| tree | 9dbba952dda63894cee5ec0e7dceb0605b7c407b | |
| parent | f41014a6b4aa31a60105dce7ef2d57d832ec7e46 (diff) | |
| download | NetworkManager-th/sd.tar.gz | |
systemd/build: split CPPFLAGS to only include needed pathsth/sd
Optimally, we only make use of 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".
| -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)\" \ |