Imported Upstream version 0.9.8.8 upstream/0.9.8.8

2 files changed, 84 insertions, 44 deletions

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index f90a9f7d..e1545548 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -4,6 +4,8 @@ EXTRA_DIST = \
 	libnm-util.deps \
 	libnm-glib.deps
 
+VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
+
 if ENABLE_VAPIGEN
 include Makefile.vapigen
 
@@ -16,13 +18,13 @@ libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir
 
 libnm_glib_vapi_METADATADIRS = $(srcdir)
 libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir
-libnm_glib_vapi_VAPIDIRS = $(srcdir)
+libnm_glib_vapi_VAPIDIRS = $(builddir)
 libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util
+libnm_glib_vapi_DEPS = gio-2.0
 
-VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
-
-vapidir = $(VAPIGEN_VAPIDIR)
+vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
-
 endif
+
+CLEANFILES = $(VAPIGEN_VAPIS)
diff --git a/vapi/Makefile.in b/vapi/Makefile.in
index d1e9f2d4..6ec20502 100644
--- a/vapi/Makefile.in
+++ b/vapi/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -54,23 +53,51 @@
 #       The files which should be used to generate the VAPI.
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -89,8 +116,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.vapigen
+DIST_COMMON = $(srcdir)/Makefile.vapigen $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am
 subdir = vapi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
@@ -111,12 +138,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -153,6 +186,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(vapidir)"
 DATA = $(vapi_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -295,7 +329,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -310,6 +343,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -397,6 +432,7 @@ EXTRA_DIST = \
 	libnm-util.deps \
 	libnm-glib.deps
 
+VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
 @ENABLE_VAPIGEN_TRUE@_vapigen_silent_prefix = $(_vapigen_silent_prefix_$(V))
 @ENABLE_VAPIGEN_TRUE@_vapigen_silent_prefix_ = $(_vapigen_silent_prefix_$(AM_DEFAULT_VERBOSITY))
 @ENABLE_VAPIGEN_TRUE@_vapigen_silent_prefix_0 = @echo " VAPIGEN $(1)";
@@ -408,11 +444,12 @@ EXTRA_DIST = \
 @ENABLE_VAPIGEN_TRUE@libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir
 @ENABLE_VAPIGEN_TRUE@libnm_glib_vapi_METADATADIRS = $(srcdir)
 @ENABLE_VAPIGEN_TRUE@libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir
-@ENABLE_VAPIGEN_TRUE@libnm_glib_vapi_VAPIDIRS = $(srcdir)
+@ENABLE_VAPIGEN_TRUE@libnm_glib_vapi_VAPIDIRS = $(builddir)
 @ENABLE_VAPIGEN_TRUE@libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util
-@ENABLE_VAPIGEN_TRUE@VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
-@ENABLE_VAPIGEN_TRUE@vapidir = $(VAPIGEN_VAPIDIR)
+@ENABLE_VAPIGEN_TRUE@libnm_glib_vapi_DEPS = gio-2.0
+@ENABLE_VAPIGEN_TRUE@vapidir = $(datadir)/vala/vapi
 @ENABLE_VAPIGEN_TRUE@vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+CLEANFILES = $(VAPIGEN_VAPIS)
 all: all-am
 
 .SUFFIXES:
@@ -474,11 +511,11 @@ uninstall-vapiDATA:
 	@list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -540,6 +577,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -617,16 +655,16 @@ uninstall-am: uninstall-vapiDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-vapiDATA installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-vapiDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-vapiDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-vapiDATA
 
 
 @ENABLE_VAPIGEN_TRUE@$(if $(VAPIGEN),,$(error You must define VAPIGEN))