summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-11-06 14:36:50 +0100
committerThomas Haller <thaller@redhat.com>2017-11-06 14:47:27 +0100
commit84878ac4e493276fefe45b3288ca48bdaa9cdaf3 (patch)
tree4ffaa7cc6b155280687b0670f13534d65ebc6ffd
parentb7b052c41e84d6f867c16701e56e35dbd10b9a49 (diff)
downloadNetworkManager-84878ac4e493276fefe45b3288ca48bdaa9cdaf3.tar.gz
build: fix glib-compile-resources for unsupported --internal flag
Travis' version of glib-compile-resources does not support the --internal flag: GEN libnm/fake-typelib/typelibs.c Unknown option --internal make: *** [libnm/fake-typelib/typelibs.c] Error 1 We don't really need it anyway, because we have a linker version script, that controls symbol visibility. Fixes: 4d1f090aedf05c0e2955d431638e311d1e18a52f
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index a7ae7868c9..23429b5741 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -967,7 +967,7 @@ libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir
$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/libnm/fake-typelib --generate-source --manual-register --internal
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/libnm/fake-typelib --generate-source --manual-register
nodist_libnm_libnm_utils_la_SOURCES = \
libnm/fake-typelib/typelibs.c