diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 309 |
1 files changed, 196 insertions, 113 deletions
diff --git a/Makefile.in b/Makefile.in index 3fe3485d..c625154c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,9 +59,9 @@ host_triplet = @host@ @WISPR_FALSE@am__append_2 = gweb/giognutls.h gweb/gionotls.c @DATAFILES_TRUE@@VPN_TRUE@am__append_3 = vpn/connman-vpn-dbus.conf @DATAFILES_TRUE@@SYSTEMD_TRUE@@VPN_TRUE@am__append_4 = vpn/connman-vpn.service -noinst_PROGRAMS = $(am__EXEEXT_1) unit/test-pbkdf2-sha1$(EXEEXT) \ - unit/test-prf-sha1$(EXEEXT) unit/test-ippool$(EXEEXT) \ - $(am__EXEEXT_2) $(am__EXEEXT_3) +noinst_PROGRAMS = unit/test-ippool$(EXEEXT) $(am__EXEEXT_2) \ + $(am__EXEEXT_3) +bin_PROGRAMS = $(am__EXEEXT_1) sbin_PROGRAMS = src/connmand$(EXEEXT) $(am__EXEEXT_4) @VPN_TRUE@am__append_5 = vpn/connman-vpnd @VPN_TRUE@am__append_6 = vpn/builtin.h @@ -71,13 +71,8 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/Makefile.in $(srcdir)/Makefile.plugins \ $(srcdir)/config.h.in $(srcdir)/connman.pc.in \ $(top_srcdir)/configure $(top_srcdir)/include/version.h.in \ - $(top_srcdir)/scripts/connman.in \ - $(top_srcdir)/src/connman.service.in \ - $(top_srcdir)/src/net.connman.service.in \ - $(top_srcdir)/vpn/connman-vpn.service.in \ - $(top_srcdir)/vpn/net.connman.vpn.service.in AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO compile config.guess config.sub \ - depcomp install-sh ltmain.sh missing + AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing @LOOPBACK_TRUE@am__append_7 = loopback @LOOPBACK_TRUE@am__append_8 = plugins/loopback.c @ETHERNET_TRUE@am__append_9 = ethernet @@ -149,10 +144,10 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @NEARD_TRUE@am__append_74 = neard @NEARD_TRUE@am__append_75 = plugins/neard.c @CLIENT_TRUE@am__append_76 = client/connmanctl -TESTS = unit/test-pbkdf2-sha1$(EXEEXT) unit/test-prf-sha1$(EXEEXT) \ - unit/test-ippool$(EXEEXT) -@WISPR_TRUE@am__append_77 = tools/wispr -@TOOLS_TRUE@am__append_78 = tools/supplicant-test \ +@CLIENT_TRUE@am__append_77 = doc/connmanctl.1 +TESTS = unit/test-ippool$(EXEEXT) +@WISPR_TRUE@am__append_78 = tools/wispr +@TOOLS_TRUE@am__append_79 = tools/supplicant-test \ @TOOLS_TRUE@ tools/dhcp-test tools/dhcp-server-test \ @TOOLS_TRUE@ tools/addr-test tools/web-test tools/resolv-test \ @TOOLS_TRUE@ tools/dbus-test tools/polkit-test \ @@ -161,8 +156,8 @@ TESTS = unit/test-pbkdf2-sha1$(EXEEXT) unit/test-prf-sha1$(EXEEXT) \ @TOOLS_TRUE@ tools/session-test tools/iptables-unit \ @TOOLS_TRUE@ tools/dnsproxy-test tools/netlink-test -@SELINUX_TRUE@@VPN_TRUE@am__append_79 = connman-task.pp @SELINUX_TRUE@@VPN_TRUE@am__append_80 = connman-task.pp +@SELINUX_TRUE@@VPN_TRUE@am__append_81 = connman-task.pp subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -173,9 +168,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = include/version.h src/connman.service \ - vpn/connman-vpn.service vpn/net.connman.vpn.service \ - scripts/connman connman.pc src/net.connman.service +CONFIG_CLEAN_FILES = include/version.h connman.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -205,8 +198,9 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(scriptdir)" \ - "$(DESTDIR)$(vpn_plugindir)" "$(DESTDIR)$(sbindir)" \ - "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(testdir)" \ + "$(DESTDIR)$(vpn_plugindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scriptdir)" \ + "$(DESTDIR)$(testdir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \ "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(dbusservicedir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(policydir)" \ @@ -359,7 +353,8 @@ vpn_plugins_vpnc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @OPENCONNECT_TRUE@am__EXEEXT_5 = scripts/openconnect-script$(EXEEXT) @OPENCONNECT_FALSE@@VPNC_TRUE@am__EXEEXT_6 = scripts/openconnect-script$(EXEEXT) @OPENVPN_TRUE@am__EXEEXT_7 = scripts/openvpn-script$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) $(script_PROGRAMS) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) \ + $(script_PROGRAMS) am__client_connmanctl_SOURCES_DIST = client/dbus_helpers.h \ client/dbus_helpers.c client/services.h client/services.c \ client/commands.h client/commands.c client/input.h \ @@ -409,7 +404,7 @@ am__src_connmand_SOURCES_DIST = gdhcp/gdhcp.h gdhcp/common.h \ src/wpad.c src/wispr.c src/stats.c src/iptables.c \ src/dnsproxy.c src/6to4.c src/ippool.c src/bridge.c src/nat.c \ src/ipaddress.c src/inotify.c src/firewall.c src/ipv6pd.c \ - src/peer.c src/peer_service.c src/machine.c + src/peer.c src/peer_service.c src/machine.c src/util.c am__objects_1 = gdhcp/src_connmand-common.$(OBJEXT) \ gdhcp/src_connmand-client.$(OBJEXT) \ gdhcp/src_connmand-server.$(OBJEXT) \ @@ -500,7 +495,8 @@ am_src_connmand_OBJECTS = $(am__objects_1) $(am__objects_4) \ src/src_connmand-ipv6pd.$(OBJEXT) \ src/src_connmand-peer.$(OBJEXT) \ src/src_connmand-peer_service.$(OBJEXT) \ - src/src_connmand-machine.$(OBJEXT) + src/src_connmand-machine.$(OBJEXT) \ + src/src_connmand-util.$(OBJEXT) src_connmand_OBJECTS = $(am_src_connmand_OBJECTS) am__DEPENDENCIES_1 = src_connmand_DEPENDENCIES = gdbus/libgdbus-internal.la \ @@ -637,14 +633,6 @@ am_unit_test_ippool_OBJECTS = src/log.$(OBJEXT) src/dbus.$(OBJEXT) \ unit/test-ippool.$(OBJEXT) unit_test_ippool_OBJECTS = $(am_unit_test_ippool_OBJECTS) unit_test_ippool_DEPENDENCIES = gdbus/libgdbus-internal.la -am_unit_test_pbkdf2_sha1_OBJECTS = unit/test-pbkdf2-sha1.$(OBJEXT) \ - src/shared/sha1.$(OBJEXT) -unit_test_pbkdf2_sha1_OBJECTS = $(am_unit_test_pbkdf2_sha1_OBJECTS) -unit_test_pbkdf2_sha1_DEPENDENCIES = -am_unit_test_prf_sha1_OBJECTS = unit/test-prf-sha1.$(OBJEXT) \ - src/shared/sha1.$(OBJEXT) -unit_test_prf_sha1_OBJECTS = $(am_unit_test_prf_sha1_OBJECTS) -unit_test_prf_sha1_DEPENDENCIES = am__vpn_connman_vpnd_SOURCES_DIST = vpn/plugins/openconnect.c \ vpn/plugins/openvpn.c vpn/plugins/vpnc.c vpn/plugins/l2tp.c \ vpn/plugins/pptp.c vpn/plugins/vpn.c vpn/plugins/vpn.h \ @@ -773,8 +761,7 @@ SOURCES = $(gdbus_libgdbus_internal_la_SOURCES) \ tools/stats-tool.c $(tools_supplicant_test_SOURCES) \ tools/tap-test.c $(tools_web_test_SOURCES) \ $(tools_wispr_SOURCES) $(tools_wpad_test_SOURCES) \ - $(unit_test_ippool_SOURCES) $(unit_test_pbkdf2_sha1_SOURCES) \ - $(unit_test_prf_sha1_SOURCES) $(vpn_connman_vpnd_SOURCES) + $(unit_test_ippool_SOURCES) $(vpn_connman_vpnd_SOURCES) DIST_SOURCES = $(gdbus_libgdbus_internal_la_SOURCES) \ plugins/hh2serial-gps.c plugins/iospm.c \ plugins/session_policy_local.c plugins/tist.c \ @@ -801,14 +788,14 @@ DIST_SOURCES = $(gdbus_libgdbus_internal_la_SOURCES) \ $(am__tools_web_test_SOURCES_DIST) \ $(am__tools_wispr_SOURCES_DIST) \ $(am__tools_wpad_test_SOURCES_DIST) \ - $(unit_test_ippool_SOURCES) $(unit_test_pbkdf2_sha1_SOURCES) \ - $(unit_test_prf_sha1_SOURCES) \ + $(unit_test_ippool_SOURCES) \ $(am__vpn_connman_vpnd_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 NROFF = nroff @@ -1028,6 +1015,14 @@ shared_sources = src/shared/util.h src/shared/util.c \ @DATAFILES_TRUE@@SYSTEMD_TRUE@systemdunitdir = @SYSTEMD_UNITDIR@ @DATAFILES_TRUE@@SYSTEMD_TRUE@systemdunit_DATA = src/connman.service \ @DATAFILES_TRUE@@SYSTEMD_TRUE@ $(am__append_4) +service_files_sources = src/connman.service.in src/net.connman.service.in \ + vpn/connman-vpn.service.in \ + vpn/net.connman.vpn.service.in + +service_files = src/connman.service src/net.connman.service \ + vpn/connman-vpn.service \ + vpn/net.connman.vpn.service + plugin_LTLIBRARIES = $(am__append_19) $(am__append_59) \ $(am__append_68) $(am__append_72) plugin_objects = $(am__append_20) $(am__append_60) $(am__append_69) \ @@ -1045,7 +1040,7 @@ builtin_sources = $(am__append_8) $(am__append_10) $(am__append_12) \ builtin_libadd = builtin_cflags = unit_objects = -MANUAL_PAGES = doc/connman.8 doc/connman.conf.5 +MANUAL_PAGES = $(am__append_77) doc/connman.8 doc/connman.conf.5 src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \ $(builtin_sources) $(shared_sources) src/connman.ver \ src/main.c src/connman.h src/log.c \ @@ -1063,7 +1058,7 @@ src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \ src/stats.c src/iptables.c src/dnsproxy.c src/6to4.c \ src/ippool.c src/bridge.c src/nat.c src/ipaddress.c \ src/inotify.c src/firewall.c src/ipv6pd.c src/peer.c \ - src/peer_service.c src/machine.c + src/peer_service.c src/machine.c src/util.c src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @GNUTLS_LIBS@ \ @@ -1101,8 +1096,10 @@ src_connmand_LDFLAGS = -Wl,--export-dynamic \ @VPN_TRUE@vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \ @VPN_TRUE@ -Wl,--version-script=$(srcdir)/vpn/vpn.ver -BUILT_SOURCES = $(local_headers) src/builtin.h $(am__append_6) -CLEANFILES = src/connman.conf $(BUILT_SOURCES) $(am__append_80) +BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) \ + scripts/connman $(am__append_6) +CLEANFILES = src/connman.conf $(BUILT_SOURCES) $(service_files) \ + $(am__append_81) statedir = $(localstatedir)/run/connman vpn_statedir = $(localstatedir)/run/connman-vpn @VPN_TRUE@vpn_plugindir = $(libdir)/connman/plugins-vpn @@ -1143,17 +1140,21 @@ src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ EXTRA_DIST = src/genbuiltin src/connman-dbus.conf \ src/connman-polkit.conf plugins/connman-nmcompat.conf \ - vpn/vpn-dbus.conf vpn/vpn-polkit.conf plugins/polkit.policy \ + $(service_files_sources) scripts/connman.in vpn/vpn-dbus.conf \ + vpn/vpn-polkit.conf plugins/polkit.policy \ vpn/vpn-polkit.policy $(test_scripts) doc/overview-api.txt \ - doc/behavior-api.txt doc/ipconfig-api.txt doc/plugin-api.txt \ + doc/behavior-api.txt doc/coding-style.txt \ + doc/wifi-p2p-overview.txt doc/vpn-agent-api.txt \ + doc/peer-api.txt doc/ipconfig-api.txt doc/plugin-api.txt \ doc/manager-api.txt doc/agent-api.txt doc/service-api.txt \ doc/technology-api.txt doc/counter-api.txt \ doc/config-format.txt doc/clock-api.txt doc/session-api.txt \ doc/session-overview.txt doc/backtrace.txt \ - doc/advanced-configuration.txt doc/vpn-connection-api.txt \ - doc/vpn-manager-api.txt doc/vpn-overview.txt \ - doc/session-policy-format.txt src/main.conf src/eduroam.config \ - $(am__append_79) vpn/connman-task.te + doc/advanced-configuration.txt doc/vpn-config-format.txt \ + doc/vpn-connection-api.txt doc/vpn-manager-api.txt \ + doc/vpn-overview.txt doc/session-policy-format.txt \ + src/main.conf src/eduroam.config $(am__append_80) \ + vpn/connman-task.te @VPN_TRUE@vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \ @VPN_TRUE@ $(builtin_vpn_cflags) \ @VPN_TRUE@ -DCONNMAN_PLUGIN_BUILTIN \ @@ -1241,7 +1242,6 @@ gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \ @SESSION_POLICY_LOCAL_BUILTIN_FALSE@@SESSION_POLICY_LOCAL_TRUE@ -DSTORAGEDIR=\""$(storagedir)\"" @SESSION_POLICY_LOCAL_BUILTIN_FALSE@@SESSION_POLICY_LOCAL_TRUE@plugins_session_policy_local_la_LDFLAGS = $(plugin_ldflags) -@CLIENT_TRUE@noinst_MANUAL_PAGES = doc/connmanctl.1 @CLIENT_TRUE@client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.c \ @CLIENT_TRUE@ client/services.h client/services.c \ @CLIENT_TRUE@ client/commands.h client/commands.c \ @@ -1254,14 +1254,6 @@ gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \ @CLIENT_TRUE@client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ \ @CLIENT_TRUE@ -lreadline -ldl -unit_test_pbkdf2_sha1_SOURCES = unit/test-pbkdf2-sha1.c \ - src/shared/sha1.h src/shared/sha1.c - -unit_test_pbkdf2_sha1_LDADD = @GLIB_LIBS@ -unit_test_prf_sha1_SOURCES = unit/test-prf-sha1.c \ - src/shared/sha1.h src/shared/sha1.c - -unit_test_prf_sha1_LDADD = @GLIB_LIBS@ unit_test_ippool_SOURCES = src/log.c src/dbus.c src/error.c \ src/ippool.c unit/test-ippool.c @@ -1345,7 +1337,12 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles \ DISTCLEANFILES = $(pkgconfig_DATA) MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ - ltmain.sh depcomp compile missing install-sh mkinstalldirs + ltmain.sh depcomp compile missing install-sh mkinstalldirs test-driver + +do_subst = $(AM_V_GEN)$(SED) \ + -e 's,[@]prefix[@],$(prefix),g' \ + -e 's,[@]sbindir[@],$(sbindir),g' \ + -e 's,[@]sysconfdir[@],$(sysconfdir),g' all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1404,18 +1401,8 @@ distclean-hdr: -rm -f config.h stamp-h1 include/version.h: $(top_builddir)/config.status $(top_srcdir)/include/version.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ -src/connman.service: $(top_builddir)/config.status $(top_srcdir)/src/connman.service.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -vpn/connman-vpn.service: $(top_builddir)/config.status $(top_srcdir)/vpn/connman-vpn.service.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -vpn/net.connman.vpn.service: $(top_builddir)/config.status $(top_srcdir)/vpn/net.connman.vpn.service.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -scripts/connman: $(top_builddir)/config.status $(top_srcdir)/scripts/connman.in - cd $(top_builddir) && $(SHELL) ./config.status $@ connman.pc: $(top_builddir)/config.status $(srcdir)/connman.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ -src/net.connman.service: $(top_builddir)/config.status $(top_srcdir)/src/net.connman.service.in - cd $(top_builddir) && $(SHELL) ./config.status $@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @@ -1607,6 +1594,52 @@ vpn/plugins/vpn_plugins_vpnc_la-vpnc.lo: vpn/plugins/$(am__dirstamp) \ vpn/plugins/$(DEPDIR)/$(am__dirstamp) vpn/plugins/vpnc.la: $(vpn_plugins_vpnc_la_OBJECTS) $(vpn_plugins_vpnc_la_DEPENDENCIES) $(EXTRA_vpn_plugins_vpnc_la_DEPENDENCIES) vpn/plugins/$(am__dirstamp) $(AM_V_CCLD)$(vpn_plugins_vpnc_la_LINK) $(am_vpn_plugins_vpnc_la_rpath) $(vpn_plugins_vpnc_la_OBJECTS) $(vpn_plugins_vpnc_la_LIBADD) $(LIBS) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -1932,6 +1965,8 @@ src/src_connmand-peer_service.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_connmand-machine.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) +src/src_connmand-util.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) src/connmand$(EXEEXT): $(src_connmand_OBJECTS) $(src_connmand_DEPENDENCIES) $(EXTRA_src_connmand_DEPENDENCIES) src/$(am__dirstamp) @rm -f src/connmand$(EXEEXT) $(AM_V_CCLD)$(src_connmand_LINK) $(src_connmand_OBJECTS) $(src_connmand_LDADD) $(LIBS) @@ -2087,18 +2122,6 @@ unit/test-ippool.$(OBJEXT): unit/$(am__dirstamp) \ unit/test-ippool$(EXEEXT): $(unit_test_ippool_OBJECTS) $(unit_test_ippool_DEPENDENCIES) $(EXTRA_unit_test_ippool_DEPENDENCIES) unit/$(am__dirstamp) @rm -f unit/test-ippool$(EXEEXT) $(AM_V_CCLD)$(LINK) $(unit_test_ippool_OBJECTS) $(unit_test_ippool_LDADD) $(LIBS) -unit/test-pbkdf2-sha1.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -src/shared/sha1.$(OBJEXT): src/shared/$(am__dirstamp) \ - src/shared/$(DEPDIR)/$(am__dirstamp) -unit/test-pbkdf2-sha1$(EXEEXT): $(unit_test_pbkdf2_sha1_OBJECTS) $(unit_test_pbkdf2_sha1_DEPENDENCIES) $(EXTRA_unit_test_pbkdf2_sha1_DEPENDENCIES) unit/$(am__dirstamp) - @rm -f unit/test-pbkdf2-sha1$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(unit_test_pbkdf2_sha1_OBJECTS) $(unit_test_pbkdf2_sha1_LDADD) $(LIBS) -unit/test-prf-sha1.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test-prf-sha1$(EXEEXT): $(unit_test_prf_sha1_OBJECTS) $(unit_test_prf_sha1_DEPENDENCIES) $(EXTRA_unit_test_prf_sha1_DEPENDENCIES) unit/$(am__dirstamp) - @rm -f unit/test-prf-sha1$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(unit_test_prf_sha1_OBJECTS) $(unit_test_prf_sha1_LDADD) $(LIBS) vpn/plugins/vpn_connman_vpnd-openconnect.$(OBJEXT): \ vpn/plugins/$(am__dirstamp) \ vpn/plugins/$(DEPDIR)/$(am__dirstamp) @@ -2280,7 +2303,6 @@ mostlyclean-compile: -rm -f src/iptables.$(OBJEXT) -rm -f src/log.$(OBJEXT) -rm -f src/shared/netlink.$(OBJEXT) - -rm -f src/shared/sha1.$(OBJEXT) -rm -f src/shared/src_connmand-netlink.$(OBJEXT) -rm -f src/shared/src_connmand-util.$(OBJEXT) -rm -f src/shared/util.$(OBJEXT) @@ -2332,6 +2354,7 @@ mostlyclean-compile: -rm -f src/src_connmand-tethering.$(OBJEXT) -rm -f src/src_connmand-timeserver.$(OBJEXT) -rm -f src/src_connmand-timezone.$(OBJEXT) + -rm -f src/src_connmand-util.$(OBJEXT) -rm -f src/src_connmand-utsname.$(OBJEXT) -rm -f src/src_connmand-wispr.$(OBJEXT) -rm -f src/src_connmand-wpad.$(OBJEXT) @@ -2373,8 +2396,6 @@ mostlyclean-compile: -rm -f tools/wispr.$(OBJEXT) -rm -f tools/wpad-test.$(OBJEXT) -rm -f unit/test-ippool.$(OBJEXT) - -rm -f unit/test-pbkdf2-sha1.$(OBJEXT) - -rm -f unit/test-prf-sha1.$(OBJEXT) -rm -f vpn/plugins/vpn_connman_vpnd-l2tp.$(OBJEXT) -rm -f vpn/plugins/vpn_connman_vpnd-openconnect.$(OBJEXT) -rm -f vpn/plugins/vpn_connman_vpnd-openvpn.$(OBJEXT) @@ -2523,6 +2544,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_connmand-tethering.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_connmand-timeserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_connmand-timezone.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_connmand-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_connmand-utsname.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_connmand-wispr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_connmand-wpad.Po@am__quote@ @@ -2541,7 +2563,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vpn_connman_vpnd-storage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vpn_connman_vpnd-task.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/shared/$(DEPDIR)/netlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/shared/$(DEPDIR)/sha1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/shared/$(DEPDIR)/src_connmand-netlink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/shared/$(DEPDIR)/src_connmand-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/shared/$(DEPDIR)/util.Po@am__quote@ @@ -2569,8 +2590,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/wispr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/wpad-test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-ippool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-pbkdf2-sha1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-prf-sha1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@vpn/$(DEPDIR)/vpn_connman_vpnd-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@vpn/$(DEPDIR)/vpn_connman_vpnd-vpn-agent.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@vpn/$(DEPDIR)/vpn_connman_vpnd-vpn-config.Po@am__quote@ @@ -3823,6 +3842,20 @@ src/src_connmand-machine.obj: src/machine.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_connmand_CFLAGS) $(CFLAGS) -c -o src/src_connmand-machine.obj `if test -f 'src/machine.c'; then $(CYGPATH_W) 'src/machine.c'; else $(CYGPATH_W) '$(srcdir)/src/machine.c'; fi` +src/src_connmand-util.o: src/util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_connmand_CFLAGS) $(CFLAGS) -MT src/src_connmand-util.o -MD -MP -MF src/$(DEPDIR)/src_connmand-util.Tpo -c -o src/src_connmand-util.o `test -f 'src/util.c' || echo '$(srcdir)/'`src/util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_connmand-util.Tpo src/$(DEPDIR)/src_connmand-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util.c' object='src/src_connmand-util.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_connmand_CFLAGS) $(CFLAGS) -c -o src/src_connmand-util.o `test -f 'src/util.c' || echo '$(srcdir)/'`src/util.c + +src/src_connmand-util.obj: src/util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_connmand_CFLAGS) $(CFLAGS) -MT src/src_connmand-util.obj -MD -MP -MF src/$(DEPDIR)/src_connmand-util.Tpo -c -o src/src_connmand-util.obj `if test -f 'src/util.c'; then $(CYGPATH_W) 'src/util.c'; else $(CYGPATH_W) '$(srcdir)/src/util.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_connmand-util.Tpo src/$(DEPDIR)/src_connmand-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util.c' object='src/src_connmand-util.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_connmand_CFLAGS) $(CFLAGS) -c -o src/src_connmand-util.obj `if test -f 'src/util.c'; then $(CYGPATH_W) 'src/util.c'; else $(CYGPATH_W) '$(srcdir)/src/util.c'; fi` + src/tools_iptables_unit-log.o: src/log.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tools_iptables_unit_CFLAGS) $(CFLAGS) -MT src/tools_iptables_unit-log.o -MD -MP -MF src/$(DEPDIR)/tools_iptables_unit-log.Tpo -c -o src/tools_iptables_unit-log.o `test -f 'src/log.c' || echo '$(srcdir)/'`src/log.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/tools_iptables_unit-log.Tpo src/$(DEPDIR)/tools_iptables_unit-log.Po @@ -4288,6 +4321,49 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +install-man1: $(dist_man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -4870,7 +4946,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ $(HEADERS) config.h installdirs: - for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(vpn_plugindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(policydir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(systemdunitdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(vpn_plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(policydir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(systemdunitdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -4936,7 +5012,7 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am -clean-am: clean-generic clean-libtool clean-local \ +clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ clean-pluginLTLIBRARIES clean-sbinPROGRAMS \ clean-scriptLTLIBRARIES clean-scriptPROGRAMS \ @@ -4973,7 +5049,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-sbinPROGRAMS +install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-html: install-html-am @@ -4983,7 +5059,7 @@ install-info: install-info-am install-info-am: -install-man: install-man5 install-man8 +install-man: install-man1 install-man5 install-man8 install-pdf: install-pdf-am @@ -5015,22 +5091,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dbusconfDATA uninstall-dbusserviceDATA \ - uninstall-includeHEADERS uninstall-man \ - uninstall-nodist_includeHEADERS uninstall-pkgconfigDATA \ - uninstall-pluginLTLIBRARIES uninstall-policyDATA \ - uninstall-sbinPROGRAMS uninstall-scriptDATA \ - uninstall-scriptLTLIBRARIES uninstall-scriptPROGRAMS \ - uninstall-systemdunitDATA uninstall-testSCRIPTS \ - uninstall-vpn_pluginLTLIBRARIES +uninstall-am: uninstall-binPROGRAMS uninstall-dbusconfDATA \ + uninstall-dbusserviceDATA uninstall-includeHEADERS \ + uninstall-man uninstall-nodist_includeHEADERS \ + uninstall-pkgconfigDATA uninstall-pluginLTLIBRARIES \ + uninstall-policyDATA uninstall-sbinPROGRAMS \ + uninstall-scriptDATA uninstall-scriptLTLIBRARIES \ + uninstall-scriptPROGRAMS uninstall-systemdunitDATA \ + uninstall-testSCRIPTS uninstall-vpn_pluginLTLIBRARIES -uninstall-man: uninstall-man5 uninstall-man8 +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ - clean clean-generic clean-libtool clean-local \ - clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + clean clean-binPROGRAMS clean-generic clean-libtool \ + clean-local clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ clean-pluginLTLIBRARIES clean-sbinPROGRAMS \ clean-scriptLTLIBRARIES clean-scriptPROGRAMS \ clean-vpn_pluginLTLIBRARIES ctags dist dist-all dist-bzip2 \ @@ -5039,13 +5115,13 @@ uninstall-man: uninstall-man5 uninstall-man8 distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dbusconfDATA \ - install-dbusserviceDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-man5 install-man8 \ - install-nodist_includeHEADERS install-pdf install-pdf-am \ - install-pkgconfigDATA install-pluginLTLIBRARIES \ + install-binPROGRAMS install-data install-data-am \ + install-dbusconfDATA install-dbusserviceDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-includeHEADERS install-info \ + install-info-am install-man install-man1 install-man5 \ + install-man8 install-nodist_includeHEADERS install-pdf \ + install-pdf-am install-pkgconfigDATA install-pluginLTLIBRARIES \ install-policyDATA install-ps install-ps-am \ install-sbinPROGRAMS install-scriptDATA \ install-scriptLTLIBRARIES install-scriptPROGRAMS install-strip \ @@ -5054,14 +5130,15 @@ uninstall-man: uninstall-man5 uninstall-man8 installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-dbusconfDATA uninstall-dbusserviceDATA \ - uninstall-includeHEADERS uninstall-man uninstall-man5 \ - uninstall-man8 uninstall-nodist_includeHEADERS \ - uninstall-pkgconfigDATA uninstall-pluginLTLIBRARIES \ - uninstall-policyDATA uninstall-sbinPROGRAMS \ - uninstall-scriptDATA uninstall-scriptLTLIBRARIES \ - uninstall-scriptPROGRAMS uninstall-systemdunitDATA \ - uninstall-testSCRIPTS uninstall-vpn_pluginLTLIBRARIES + uninstall-am uninstall-binPROGRAMS uninstall-dbusconfDATA \ + uninstall-dbusserviceDATA uninstall-includeHEADERS \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 \ + uninstall-nodist_includeHEADERS uninstall-pkgconfigDATA \ + uninstall-pluginLTLIBRARIES uninstall-policyDATA \ + uninstall-sbinPROGRAMS uninstall-scriptDATA \ + uninstall-scriptLTLIBRARIES uninstall-scriptPROGRAMS \ + uninstall-systemdunitDATA uninstall-testSCRIPTS \ + uninstall-vpn_pluginLTLIBRARIES plugins/net.connman.policy: plugins/polkit.policy @@ -5087,6 +5164,12 @@ src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf @SELINUX_TRUE@connman-task.pp: vpn/connman-task.te @SELINUX_TRUE@ make -f /usr/share/selinux/devel/Makefile +%.service: %.service.in Makefile + $(do_subst) < $< > $@ + +scripts/connman: scripts/connman.in Makefile + $(do_subst) < $< > $@ + include/connman/version.h: include/version.h $(AM_V_at)$(MKDIR_P) include/connman $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@ |