X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=14d6ca1779d00ca4bbc9a9be2fca42c796953c8c;hb=664e356ee119cc6a7650610518fa341d1a1f5ca5;hp=9fd16a0d36ed9d02bdec50b786506b496f35afe0;hpb=13294d79e3412a68c541fd6a22840bf85521a420;p=platform%2Fupstream%2Fconnman.git diff --git a/Makefile.am b/Makefile.am old mode 100755 new mode 100644 index 9fd16a0..14d6ca1 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,12 @@ include_HEADERS = include/log.h include/plugin.h \ include/device.h include/network.h include/inet.h \ include/storage.h include/provision.h \ include/session.h include/ipaddress.h include/agent.h \ - include/inotify.h include/peer.h include/machine.h + include/inotify.h include/peer.h include/machine.h \ + include/acd.h include/tethering.h + +if TIZEN_EXT_WIFI_MESH +include_HEADERS += include/mesh.h include/mesh-netlink.h +endif nodist_include_HEADERS = include/version.h @@ -19,7 +24,8 @@ noinst_HEADERS = include/rtnl.h include/task.h \ include/dbus.h include/option.h \ include/provider.h include/vpn-dbus.h \ include/utsname.h include/timeserver.h include/proxy.h \ - include/technology.h include/setting.h + include/technology.h include/setting.h \ + include/backtrace.h local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \ $(noinst_HEADERS), include/connman/$(notdir $(file))) @@ -31,6 +37,10 @@ gdbus_libgdbus_internal_la_SOURCES = gdbus/gdbus.h \ gdbus/mainloop.c gdbus/watch.c \ gdbus/object.c gdbus/client.c gdbus/polkit.c +if BACKTRACE +backtrace_sources = src/backtrace.c +endif + gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c \ gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.c gdhcp/unaligned.h @@ -42,8 +52,14 @@ else gweb_sources += gweb/giognutls.h gweb/gionotls.c endif +if STATS +stats_sources = src/stats.c +else +stats_sources = src/nostats.c +endif + shared_sources = src/shared/util.h src/shared/util.c \ - src/shared/netlink.h src/shared/netlink.c + src/shared/arp.h src/shared/arp.c if DATAFILES @@ -59,19 +75,32 @@ if VPN dbusconf_DATA += vpn/connman-vpn-dbus.conf dbusservicedir = @DBUS_DATADIR@ dbusservice_DATA = vpn/net.connman.vpn.service -endif if SYSTEMD systemdunitdir = @SYSTEMD_UNITDIR@ systemdunit_DATA = src/connman.service vpn/connman-vpn.service endif -endif service_files_sources = src/connman.service.in src/net.connman.service.in \ - vpn/net.connman.vpn.service.in vpn/connman-vpn.service.in + vpn/connman-vpn.service.in \ + vpn/net.connman.vpn.service.in service_files = src/connman.service src/net.connman.service \ - vpn/net.connman.vpn.service vpn/connman-vpn.service + vpn/connman-vpn.service \ + vpn/net.connman.vpn.service + +else + +if SYSTEMD +systemdunitdir = @SYSTEMD_UNITDIR@ +systemdunit_DATA = src/connman.service + +endif + +service_files_sources = src/connman.service.in src/net.connman.service.in +service_files = src/connman.service src/net.connman.service +endif +endif plugin_LTLIBRARIES = @@ -83,17 +112,25 @@ builtin_libadd = builtin_cflags = noinst_PROGRAMS = +if TIZEN_EXT +bin_PROGRAMS = src/connmand +else bin_PROGRAMS = +endif unit_objects = MANUAL_PAGES = -sbin_PROGRAMS = src/connmand +if TIZEN_EXT +sbin_PROGRAMS = +else +sbin_PROGRAMS = src/connmand src/connmand-wait-online +endif -src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \ - $(builtin_sources) $(shared_sources) src/connman.ver \ - src/main.c src/connman.h src/log.c \ +src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) $(stats_sources) \ + $(backtrace_sources) $(builtin_sources) $(shared_sources) \ + src/connman.ver src/main.c src/connman.h src/log.c \ src/error.c src/plugin.c src/task.c \ src/device.c src/network.c src/connection.c \ src/manager.c src/service.c \ @@ -105,19 +142,47 @@ src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \ src/storage.c src/dbus.c src/config.c \ src/technology.c src/counter.c src/ntp.c \ src/session.c src/tethering.c 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/util.c + src/6to4.c src/ippool.c src/bridge.c src/nat.c \ + src/ipaddress.c src/inotify.c src/ipv6pd.c src/peer.c \ + src/peer_service.c src/machine.c src/util.c \ + src/acd.c + +if INTERNAL_DNS_BACKEND +src_connmand_SOURCES += src/dnsproxy.c +endif +if SYSTEMD_RESOLVED_DNS_BACKEND +src_connmand_SOURCES += src/dns-systemd-resolved.c +endif +if TIZEN_EXT_WIFI_MESH +src_connmand_SOURCES += src/mesh.c src/mesh-netlink.c +endif src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ - @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \ - @TPKP_GNUTLS_LIBS@ \ + @DLOG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \ -lresolv -ldl -lrt +if TIZEN_EXT_WIFI_MESH +src_connmand_LDADD += @LIBNL_LIBS@ @LIBNL_GENL_LIBS@ +endif + src_connmand_LDFLAGS = -Wl,--export-dynamic -pie \ -Wl,--version-script=$(srcdir)/src/connman.ver +src_connmand_wait_online_SOURCES = src/connmand-wait-online.c + +src_connmand_wait_online_LDADD = gdbus/libgdbus-internal.la \ + @DLOG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ + +if XTABLES +src_connmand_SOURCES += src/iptables.c src/firewall-iptables.c +src_connmand_LDADD += @XTABLES_LIBS@ +endif + +if NFTABLES +src_connmand_SOURCES += src/firewall-nftables.c +src_connmand_LDADD += @NFTABLES_LIBS@ @LIBMNL_LIBS@ +endif + if VPN vpn_plugin_LTLIBRARIES = @@ -128,9 +193,14 @@ builtin_vpn_sources = builtin_vpn_libadd = builtin_vpn_cflags = +if TIZEN_EXT +bin_PROGRAMS += vpn/connman-vpnd +else sbin_PROGRAMS += vpn/connman-vpnd +endif vpn_connman_vpnd_SOURCES = $(gdhcp_sources) $(builtin_vpn_sources) \ + $(shared_sources) \ $(gweb_sources) vpn/vpn.ver vpn/main.c vpn/vpn.h \ vpn/vpn-manager.c vpn/vpn-provider.c \ vpn/vpn-provider.h vpn/vpn-rtnl.h \ @@ -148,21 +218,34 @@ vpn_connman_vpnd_SOURCES = $(gdhcp_sources) $(builtin_vpn_sources) \ src/session.c src/tethering.c 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/inotify.c src/firewall-iptables.c src/ipv6pd.c src/peer.c \ src/peer_service.c src/machine.c src/util.c \ vpn/vpn-agent.c vpn/vpn-agent.h \ - vpn/vpn-config.c + vpn/vpn-config.c vpn/vpn-settings.c src/acd.c + +if TIZEN_EXT_WIFI_MESH +vpn_connman_vpnd_SOURCES += src/mesh.c src/mesh-netlink.c +endif vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \ - @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @GNUTLS_LIBS@ \ - @TPKP_GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \ + @DLOG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \ + @LIBSYSTEMD_LIBS@ @XTABLES_LIBS@ \ -lresolv -ldl +if TIZEN_EXT_WIFI_MESH +vpn_connman_vpnd_LDADD += @LIBNL_LIBS@ @LIBNL_GENL_LIBS@ +endif + vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/vpn/vpn.ver endif -BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) scripts/connman +BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) \ + scripts/connman + +if INTERNAL_DNS_BACKEND +BUILT_SOURCES += scripts/connman_resolvconf.conf +endif if VPN BUILT_SOURCES += vpn/builtin.h @@ -170,8 +253,8 @@ endif CLEANFILES = src/connman.conf $(BUILT_SOURCES) $(service_files) -statedir = $(localstatedir)/run/connman -vpn_statedir = $(localstatedir)/run/connman-vpn +statedir = $(runstatedir)/connman +vpn_statedir = $(runstatedir)/connman-vpn if VPN vpn_plugindir = $(libdir)/connman/plugins-vpn @@ -200,8 +283,8 @@ build_vpn_plugindir = $(vpn_plugindir) endif endif -AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @LIBSYSTEMD_CFLAGS@\ - @GNUTLS_CFLAGS@ @TPKP_GNUTLS_CFLAGS@ $(builtin_cflags) \ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LIBSYSTEMD_CFLAGS@ @DLOG_CFLAGS@ \ + @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ @@ -213,13 +296,13 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @LIBSYSTEMD_CFLAGS@\ -fPIE if VPN -AM_CPPFLAGS = @TPKP_GNUTLS_CFLAGS@ -I$(builddir)/include -I$(srcdir)/gdbus +AM_CPPFLAGS = -I$(builddir)/include -I$(srcdir)/gdbus else -AM_CPPFLAGS = @TPKP_GNUTLS_CFLAGS@ -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus +AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus endif -src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ - @GNUTLS_CFLAGS@ @TPKP_GNUTLS_CFLAGS@ $(builtin_cflags) \ +src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @DLOG_CFLAGS@ \ + @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ -DPLUGINDIR=\""$(build_plugindir)"\" \ @@ -234,7 +317,7 @@ EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf \ $(service_files_sources) scripts/connman.in if VPN -vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ +vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @DLOG_CFLAGS@ \ $(builtin_vpn_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ @@ -247,6 +330,24 @@ vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ endif +if XTABLES +AM_CFLAGS += @XTABLES_CFLAGS@ +src_connmand_CFLAGS += @XTABLES_CFLAGS@ +endif + +if NFTABLES +AM_CFLAGS += @NFTABLES_CFLAGS@ @LIBMNL_CFLAGS@ +src_connmand_CFLAGS += @NFTABLES_CFLAGS@ @LIBMNL_CFLAGS@ +endif + +if TIZEN_EXT_WIFI_MESH +AM_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@ +src_connmand_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@ +if VPN +vpn_connman_vpnd_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@ +endif +endif + EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf script_DATA = @@ -258,27 +359,34 @@ include Makefile.plugins if CLIENT bin_PROGRAMS += client/connmanctl -MANUAL_PAGES = doc/connmanctl.1 - client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.c \ client/services.h client/services.c \ client/commands.h client/commands.c \ client/input.h client/input.c \ client/agent.h client/agent.c \ client/peers.h client/peers.c \ + client/tethering.h client/tethering.c \ client/vpnconnections.h client/vpnconnections.c \ client/main.c -client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ \ +if TIZEN_EXT_WIFI_MESH +client_connmanctl_SOURCES += client/mesh.c client/mesh.h +endif + +if TIZEN_EXT_INS +client_connmanctl_SOURCES += client/ins.c client/ins.h +endif + +client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ @DLOG_LIBS@ \ -lreadline -ldl -lncurses endif noinst_PROGRAMS += unit/test-ippool -unit_test_ippool_SOURCES = src/log.c src/dbus.c src/error.c \ - src/ippool.c unit/test-ippool.c +unit_test_ippool_SOURCES = $(backtrace_sources) src/log.c src/dbus.c \ + src/error.c src/ippool.c unit/test-ippool.c unit_test_ippool_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ -ldl + @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ -ldl TESTS = unit/test-ippool @@ -286,7 +394,7 @@ if WISPR noinst_PROGRAMS += tools/wispr tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c -tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ @TPKP_GNUTLS_LIBS@ -lresolv +tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv endif if TOOLS @@ -294,19 +402,19 @@ noinst_PROGRAMS += tools/supplicant-test \ tools/dhcp-test tools/dhcp-server-test \ tools/addr-test tools/web-test tools/resolv-test \ tools/dbus-test tools/polkit-test \ - tools/iptables-test tools/tap-test tools/wpad-test \ + tools/tap-test tools/wpad-test \ tools/stats-tool tools/private-network-test \ - tools/session-test tools/iptables-unit \ - tools/dnsproxy-test tools/netlink-test + tools/session-test \ + tools/dnsproxy-test tools_supplicant_test_SOURCES = tools/supplicant-test.c \ tools/supplicant-dbus.h tools/supplicant-dbus.c \ tools/supplicant.h tools/supplicant.c tools_supplicant_test_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ + @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c -tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ @TPKP_GNUTLS_LIBS@ -lresolv +tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv tools_resolv_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/resolv-test.c tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv @@ -316,41 +424,60 @@ tools_wpad_test_LDADD = @GLIB_LIBS@ -lresolv tools_stats_tool_LDADD = @GLIB_LIBS@ -tools_dhcp_test_SOURCES = $(gdhcp_sources) tools/dhcp-test.c -tools_dhcp_test_LDADD = @GLIB_LIBS@ +tools_dhcp_test_SOURCES = $(backtrace_sources) src/log.c src/util.c \ + $(gdhcp_sources) src/inet.c tools/dhcp-test.c src/shared/arp.c +tools_dhcp_test_LDADD = @GLIB_LIBS@ -ldl -tools_dhcp_server_test_SOURCES = $(gdhcp_sources) tools/dhcp-server-test.c -tools_dhcp_server_test_LDADD = @GLIB_LIBS@ +tools_dhcp_server_test_SOURCES = $(backtrace_sources) src/log.c src/util.c \ + $(gdhcp_sources) src/inet.c tools/dhcp-server-test.c src/shared/arp.c +tools_dhcp_server_test_LDADD = @GLIB_LIBS@ -ldl tools_dbus_test_SOURCES = tools/dbus-test.c -tools_dbus_test_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ - -tools_polkit_test_LDADD = @DBUS_LIBS@ +tools_dbus_test_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ -tools_iptables_test_SOURCES = src/log.c src/iptables.c tools/iptables-test.c -tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ -ldl +tools_polkit_test_LDADD = @DBUS_LIBS@ @DLOG_LIBS@ -tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ +tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ -tools_session_test_SOURCES = src/log.c src/dbus.c src/error.c \ +tools_session_test_SOURCES = $(backtrace_sources) src/log.c src/dbus.c src/error.c \ tools/session-test.c tools/session-utils.c tools/manager-api.c \ tools/session-api.c tools/session-test.h tools_session_test_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ -ldl + @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ -ldl + +if XTABLES +noinst_PROGRAMS += tools/iptables-test tools/ip6tables-test tools/iptables-unit \ + unit/test-iptables + +tools_iptables_test_SOURCES = $(backtrace_sources) src/log.c src/iptables.c \ + tools/iptables-test.c +tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ -ldl + +tools_ip6tables_test_SOURCES = $(backtrace_sources) src/log.c src/iptables.c \ + tools/ip6tables-test.c +tools_ip6tables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ -ldl -tools_iptables_unit_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ - -DIPTABLES_SAVE=\""${IPTABLES_SAVE}"\" -tools_iptables_unit_SOURCES = src/log.c \ - src/iptables.c src/firewall.c src/nat.c tools/iptables-unit.c +tools_iptables_unit_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @DLOG_CFLAGS@ \ + -DIPTABLES_SAVE=\""${IPTABLES_SAVE}"\" \ + -DIP6TABLES_SAVE=\""${IP6TABLES_SAVE}"\" +tools_iptables_unit_SOURCES = $(backtrace_sources) src/log.c \ + src/iptables.c src/firewall-iptables.c src/nat.c \ + tools/iptables-unit.c tools_iptables_unit_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl + @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @DLOG_LIBS@ -ldl + +TESTS += unit/test-iptables + +unit_test_iptables_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) @GLIB_CFLAGS@ +unit_test_iptables_SOURCES = $(backtrace_sources) src/connman.h src/log.c \ + unit/test-iptables.c src/iptables.c +unit_test_iptables_LDADD = @GLIB_LIBS@ -ldl + +endif tools_dnsproxy_test_SOURCES = tools/dnsproxy-test.c tools_dnsproxy_test_LDADD = @GLIB_LIBS@ -tools_netlink_test_SOURCES =$(shared_sources) tools/netlink-test.c -tools_netlink_test_LDADD = @GLIB_LIBS@ - endif test_scripts = test/get-state test/list-services \ @@ -390,14 +517,22 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.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 + doc/session-policy-format.txt \ + doc/connmanctl.1.in doc/connman.conf.5.in \ + doc/connman-service.config.5.in \ + doc/connman-vpn.conf.5.in \ + doc/connman-vpn-provider.config.5.in \ + doc/connman.8.in doc/connman-vpn.8.in EXTRA_DIST += src/main.conf \ src/eduroam.config -MANUAL_PAGES += doc/connman.8 doc/connman.conf.5 +#MANUAL_PAGES += doc/connmanctl.1 doc/connman.conf.5 \ +# doc/connman-service.config.5 doc/connman-vpn.conf.5 \ +# doc/connman-vpn-provider.config.5 \ +# doc/connman.8 doc/connman-vpn.8 -dist_man_MANS = $(MANUAL_PAGES) +nodist_man_MANS = $(MANUAL_PAGES) pkgconfigdir = $(libdir)/pkgconfig @@ -421,9 +556,11 @@ MAINTAINERCLEANFILES = Makefile.in \ src/builtin.h: src/genbuiltin $(builtin_sources) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ vpn/builtin.h: src/genbuiltin $(builtin_vpn_sources) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_vpn_modules) > $@ src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf @@ -440,6 +577,7 @@ if POLKIT else $(AM_V_GEN)cp $(srcdir)/vpn/vpn-dbus.conf $@ endif +CLEANFILES += vpn/connman-vpn-dbus.conf endif if SELINUX @@ -457,12 +595,34 @@ EXTRA_DIST += vpn/connman-task.te do_subst = $(AM_V_GEN)$(SED) \ -e 's,[@]prefix[@],$(prefix),g' \ -e 's,[@]sbindir[@],$(sbindir),g' \ - -e 's,[@]sysconfdir[@],$(sysconfdir),g' + -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ + -e 's,[@]storagedir[@],$(storagedir),g' \ + -e 's,[@]vpn_storagedir[@],$(vpn_storagedir),g' \ + -e 's,[@]localstatedir[@],$(localstatedir),g' \ + -e 's,[@]runstatedir[@],$(runstatedir),g' + +%.1 : %.1.in + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ + +%.5 : %.5.in + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ + +%.8 : %.8.in + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ %.service: %.service.in Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) $(do_subst) < $< > $@ scripts/connman: scripts/connman.in Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ + +scripts/connman_resolvconf.conf: scripts/connman_resolvconf.conf.in + $(AM_V_at)$(MKDIR_P) $(dir $@) $(do_subst) < $< > $@ include/connman/version.h: include/version.h @@ -474,4 +634,4 @@ include/connman/%.h: $(abs_top_srcdir)/include/%.h $(AM_V_GEN)$(LN_S) $< $@ clean-local: - @$(RM) -rf include/connman + @$(RM) -rf include/connman $(MANUAL_PAGES)