about summary refs log tree commit diff
path: root/src/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in52
1 files changed, 33 insertions, 19 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 6828f69c..da305209 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -115,8 +125,6 @@ sbin_PROGRAMS = NetworkManager$(EXEEXT)
 
 libexec_PROGRAMS = nm-iface-helper$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
 	$(top_srcdir)/m4/compiler_warnings.m4 \
@@ -133,6 +141,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
 	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -182,11 +191,12 @@ am__libNetworkManager_la_SOURCES_DIST = devices/nm-device-bond.h \
 	platform/wifi/wifi-utils.h rdisc/nm-fake-rdisc.c \
 	rdisc/nm-fake-rdisc.h rdisc/nm-lndp-rdisc.c \
 	rdisc/nm-lndp-rdisc.h rdisc/nm-rdisc.c rdisc/nm-rdisc.h \
-	ppp-manager/nm-ppp-manager.c ppp-manager/nm-ppp-manager.h \
-	ppp-manager/nm-ppp-status.h settings/nm-agent-manager.c \
-	settings/nm-agent-manager.h settings/nm-inotify-helper.c \
-	settings/nm-inotify-helper.h settings/nm-secret-agent.c \
-	settings/nm-secret-agent.h settings/nm-settings-connection.c \
+	rdisc/nm-rdisc-private.h ppp-manager/nm-ppp-manager.c \
+	ppp-manager/nm-ppp-manager.h ppp-manager/nm-ppp-status.h \
+	settings/nm-agent-manager.c settings/nm-agent-manager.h \
+	settings/nm-inotify-helper.c settings/nm-inotify-helper.h \
+	settings/nm-secret-agent.c settings/nm-secret-agent.h \
+	settings/nm-settings-connection.c \
 	settings/nm-settings-connection.h settings/nm-settings.c \
 	settings/nm-settings.h settings/nm-system-config-interface.c \
 	settings/nm-system-config-interface.h \
@@ -487,6 +497,8 @@ DIST_SUBDIRS = . devices/adsl devices/wifi dhcp-manager ppp-manager \
 	settings/plugins devices/wwan devices/bluetooth devices/wimax \
 	devices/team dhcp-manager/tests dnsmasq-manager/tests platform \
 	rdisc supplicant-manager/tests tests
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -538,7 +550,6 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@
 DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@
@@ -573,6 +584,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -946,11 +958,12 @@ nm_sources = $(nm_device_headers) $(nm_dhcp_client_headers) \
 	platform/wifi/wifi-utils.h rdisc/nm-fake-rdisc.c \
 	rdisc/nm-fake-rdisc.h rdisc/nm-lndp-rdisc.c \
 	rdisc/nm-lndp-rdisc.h rdisc/nm-rdisc.c rdisc/nm-rdisc.h \
-	ppp-manager/nm-ppp-manager.c ppp-manager/nm-ppp-manager.h \
-	ppp-manager/nm-ppp-status.h settings/nm-agent-manager.c \
-	settings/nm-agent-manager.h settings/nm-inotify-helper.c \
-	settings/nm-inotify-helper.h settings/nm-secret-agent.c \
-	settings/nm-secret-agent.h settings/nm-settings-connection.c \
+	rdisc/nm-rdisc-private.h ppp-manager/nm-ppp-manager.c \
+	ppp-manager/nm-ppp-manager.h ppp-manager/nm-ppp-status.h \
+	settings/nm-agent-manager.c settings/nm-agent-manager.h \
+	settings/nm-inotify-helper.c settings/nm-inotify-helper.h \
+	settings/nm-secret-agent.c settings/nm-secret-agent.h \
+	settings/nm-settings-connection.c \
 	settings/nm-settings-connection.h settings/nm-settings.c \
 	settings/nm-settings.h settings/nm-system-config-interface.c \
 	settings/nm-system-config-interface.h \
@@ -1121,7 +1134,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -1388,14 +1400,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -2351,6 +2363,8 @@ uninstall-am: uninstall-dbusserviceDATA uninstall-libexecPROGRAMS \
 	tags tags-am uninstall uninstall-am uninstall-dbusserviceDATA \
 	uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 include $(GLIB_MAKEFILE)
 
 @GNOME_CODE_COVERAGE_RULES@