diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-03-23 18:29:02 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-23 18:50:34 +0100 |
| commit | d7ad13591be6bc29188ed6e421abb8dad07305f0 (patch) | |
| tree | b134abfbdd78a42ef97ee7b3d3b1890f5fd4eaf7 /Makefile.am | |
| parent | e4c0a4d0f22e1135173032d221d6c2756cf1da3f (diff) | |
| download | NetworkManager-d7ad13591be6bc29188ed6e421abb8dad07305f0.tar.gz | |
build: fix out-of-tree build for including "clients/cli/settings-docs.c"
"$(srcdir)/clients/cli/settings.c" includes "$(builddir)/clients/cli/settings-docs.c",
hence, we need "-I$(builddir)/clients/cli".
This basically reverts commit bbce089840e9b85808e01a5e0c265d3fa3186e61,
but adds dependencies so that the build directory exists.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ba551d1571..8ff88eb664 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3067,6 +3067,7 @@ clients_cli_nmcli_CPPFLAGS = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -I$(srcdir)/clients/cli \ + -I$(builddir)/clients/cli \ -I$(srcdir)/clients/common \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nmcli"\" \ @@ -3089,6 +3090,7 @@ clients_cli_nmcli_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" $(clients_cli_nmcli_OBJECTS): $(clients_cli_settings_doc_c) +$(clients_cli_nmcli_OBJECTS): clients/cli/.dirstamp install-data-hook-nmcli: $(mkinstalldirs) $(DESTDIR)$(completiondir) @@ -3106,6 +3108,7 @@ endif clients_cli_settings_doc_c = clients/cli/settings-docs.c if HAVE_INTROSPECTION +$(clients_cli_settings_doc_c): clients/cli/.dirstamp $(clients_cli_settings_doc_c): clients/cli/settings-docs.xsl libnm/nm-property-docs.xml $(AM_V_GEN) $(XSLTPROC) --output $@ $^ DISTCLEANFILES += $(clients_cli_settings_doc_c) |