diff options
| author | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
| commit | 5916ab88146d04273e6a1895ba3eed7322f2625f (patch) | |
| tree | 54479065ceda124ef5ff84890de64c52717a5645 /src/Makefile.in | |
| parent | 3f830f75cf071873c36e1365f80c31e2422e1f7c (diff) | |
| parent | a6ece1a2aa19a6268335c87d4fdef20123dd04a5 (diff) | |
Merge tag 'upstream/1.0.8'
Upstream version 1.0.8
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 2b999969..34ba856c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -654,6 +654,7 @@ LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -800,9 +801,10 @@ SUBDIRS = . devices/adsl dhcp-manager ppp-manager settings/plugins \ # add each subdirectory that contains a libNM source file. $(sort) is being used # primarily for its side effect of removing duplicates. -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core -I$(top_srcdir)/callouts \ - -DPREFIX=\"$(prefix)\" -DG_LOG_DOMAIN=\""NetworkManager"\" \ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \ + -I$(top_srcdir)/libnm-core -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/callouts -DPREFIX=\"$(prefix)\" \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE $(foreach \ d,$(sort $(dir \ @@ -888,6 +890,7 @@ libsystemd_dhcp_la_SOURCES = \ libsystemd_dhcp_la_CPPFLAGS = \ -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ $(SYSTEMD_DHCP_CFLAGS) \ $(GLIB_CFLAGS) |