colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix out-of-tree build for including "clients/cli/settings-docs.c"

Browse Source 
"$(srcdir)/clients/cli/settings.c" includes "$(builddir)/clients/cli/settings-docs.c",
hence, we need "-I$(builddir)/clients/cli".

This basically reverts commit bbce089840,
but adds dependencies so that the build directory exists.
This commit is contained in:
Thomas Haller
2017-03-23 18:29:02 +01:00
parent e4c0a4d0f2
commit d7ad13591b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@@ -3067,6 +3067,7 @@ clients_cli_nmcli_CPPFLAGS = \
-I$(srcdir)/libnm \ -I$(srcdir)/libnm \
-I$(builddir)/libnm \ -I$(builddir)/libnm \
-I$(srcdir)/clients/cli \ -I$(srcdir)/clients/cli \
-I$(builddir)/clients/cli \
-I$(srcdir)/clients/common \ -I$(srcdir)/clients/common \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nmcli"\" \ -DG_LOG_DOMAIN=\""nmcli"\" \
@@ -3089,6 +3090,7 @@ clients_cli_nmcli_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" -Wl,--version-script="$(srcdir)/linker-script-binary.ver"
$(clients_cli_nmcli_OBJECTS): $(clients_cli_settings_doc_c) $(clients_cli_nmcli_OBJECTS): $(clients_cli_settings_doc_c)
$(clients_cli_nmcli_OBJECTS): clients/cli/.dirstamp
install-data-hook-nmcli: install-data-hook-nmcli:
$(mkinstalldirs) $(DESTDIR)$(completiondir) $(mkinstalldirs) $(DESTDIR)$(completiondir)
@@ -3106,6 +3108,7 @@ endif
clients_cli_settings_doc_c = clients/cli/settings-docs.c clients_cli_settings_doc_c = clients/cli/settings-docs.c
if HAVE_INTROSPECTION 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 $(clients_cli_settings_doc_c): clients/cli/settings-docs.xsl libnm/nm-property-docs.xml
$(AM_V_GEN) $(XSLTPROC) --output $@ $^ $(AM_V_GEN) $(XSLTPROC) --output $@ $^
DISTCLEANFILES += $(clients_cli_settings_doc_c) DISTCLEANFILES += $(clients_cli_settings_doc_c)