diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:24 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:24 +0200 |
| commit | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (patch) | |
| tree | 25da3ad8d884f15bde3c263281680a5fc3ea80e0 /introspection | |
| parent | 867254ea7c2b193fecf8cd36cc6e5dc53c290d92 (diff) | |
Imported Upstream version 0.9.5.96 upstream/0.9.5.96
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/Makefile.in | 27 | ||||
| -rw-r--r-- | introspection/nm-device.xml | 7 |
2 files changed, 22 insertions, 12 deletions
diff --git a/introspection/Makefile.in b/introspection/Makefile.in index 31078f0f..f4a6b492 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,11 +54,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = all.xml CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +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_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -421,10 +421,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 7f6a0a07..20bbb917 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -274,6 +274,11 @@ The device is a VLAN interface. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="ADSL" value="12"> + <tp:docstring> + The device is an ADSL device supporting PPPoE and PPPoATM protocols. + </tp:docstring> + </tp:enumvalue> </tp:enum> <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u"> @@ -544,7 +549,7 @@ A dependency of the connection failed. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="BR2684_FAILED" value="50"> + <tp:enumvalue suffix="BR2684_FAILED" value="51"> <tp:docstring> Problem with the RFC 2684 Ethernet over ADSL bridge. </tp:docstring> |