Imported Upstream version 0.8.998upstream/0.8.998

1 files changed, 42 insertions, 9 deletions

diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index fd5eccefb..0a29e9c55 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -24,18 +24,23 @@ libnm_util_include_HEADERS = 		\
 	nm-setting-gsm.h		\
 	nm-setting-cdma.h		\
 	nm-setting-olpc-mesh.h		\
+	nm-setting-wimax.h		\
 	nm-setting-wired.h		\
 	nm-setting-wireless.h		\
 	nm-setting-wireless-security.h	\
 	nm-setting-vpn.h		\
 	nm-utils.h
 
-libnm_util_la_SOURCES=			\
-	crypto.c			\
+libnm_util_la_private_headers = \
 	crypto.h			\
+	nm-param-spec-specialized.h	\
+	nm-utils-private.h \
+	nm-setting-private.h
+
+libnm_util_la_csources = \
+	crypto.c			\
 	nm-connection.c			\
 	nm-param-spec-specialized.c	\
-	nm-param-spec-specialized.h \
 	nm-setting.c			\
 	nm-setting-8021x.c		\
 	nm-setting-bluetooth.c		\
@@ -48,20 +53,23 @@ libnm_util_la_SOURCES=			\
 	nm-setting-gsm.c		\
 	nm-setting-cdma.c		\
 	nm-setting-olpc-mesh.c		\
+	nm-setting-wimax.c		\
 	nm-setting-wired.c		\
 	nm-setting-wireless.c		\
 	nm-setting-wireless-security.c	\
 	nm-setting-vpn.c		\
-	nm-utils.c			\
-	nm-utils-private.h \
-	$(libnm_util_include_HEADERS)
+	nm-utils.c
+
+libnm_util_la_SOURCES = \
+	$(libnm_util_la_csources) \
+	$(libnm_util_la_private_headers)
 
 libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS)
 
 SYMBOL_VIS_FILE=$(srcdir)/libnm-util.ver
 
 libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-	-version-info "7:1:6"
+	-version-info "2:0:0"
 
 if WITH_GNUTLS
 libnm_util_la_SOURCES += crypto_gnutls.c
@@ -104,15 +112,40 @@ libtest_crypto_la_CPPFLAGS += $(NSS_CFLAGS)
 libtest_crypto_la_LIBADD += $(NSS_LIBS)
 endif
 
-
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnm-util.pc
 
 DISTCLEANFILES = libnm-util.pc
+CLEANFILES = 
 
 EXTRA_DIST = libnm-util.pc.in libnm-util.ver
 
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = $(libnm_util_include_HEADERS) $(libnm_util_la_csources) $(top_srcdir)/include/NetworkManager.h $(top_srcdir)/include/NetworkManagerVPN.h
+
+NetworkManager-1.0.gir: libnm-util.la
+NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
+NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
+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_
+INTROSPECTION_GIRS += NetworkManager-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
+
 if WITH_TESTS
 
 check-local: