From 9966ac45fa80fec89d58a5b607377c75e6aa8f6d Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Mon, 11 Jun 2012 15:03:01 -0500 Subject: [PATCH] introspection: fix wrong symbol prefix in the Makefile (bgo #677498) While the python and JS bindings don't have an issue with "nm_", the Vala ones apparently do. --- libnm-glib/Makefile.am | 2 +- libnm-util/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 5dfb3acf91..0c4b77adee 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -221,7 +221,7 @@ NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn NMClient_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util NMClient_1_0_gir_LIBS = libnm-glib.la NMClient_1_0_gir_FILES = $(introspection_sources) -NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm_ --include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir +NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm --include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir INTROSPECTION_GIRS += NMClient-1.0.gir girdir = $(datadir)/gir-1.0 diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 680681e227..76acd99fcf 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -153,7 +153,7 @@ NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util NetworkManager_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-util NetworkManager_1_0_gir_LIBS = libnm-util.la NetworkManager_1_0_gir_FILES = $(introspection_sources) -NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm_ +NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm INTROSPECTION_GIRS += NetworkManager-1.0.gir girdir = $(datadir)/gir-1.0