diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 141 |
1 files changed, 107 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index 507736d7..e67a7a55 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,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))) @@ -42,6 +43,10 @@ else gweb_sources += gweb/giognutls.h gweb/gionotls.c endif +if BACKTRACE +backtrace_sources = src/backtrace.c +endif + shared_sources = src/shared/util.h src/shared/util.c \ src/shared/netlink.h src/shared/netlink.c @@ -63,8 +68,10 @@ endif if SYSTEMD systemdunitdir = @SYSTEMD_UNITDIR@ +systemdunit_DATA = src/connman.service src/connman-wait-online.service -systemdunit_DATA = src/connman.service +tmpfilesdir = @SYSTEMD_TMPFILESDIR@ +nodist_tmpfiles_DATA = scripts/connman_resolvconf.conf if VPN systemdunit_DATA += vpn/connman-vpn.service @@ -74,10 +81,12 @@ endif service_files_sources = src/connman.service.in src/net.connman.service.in \ vpn/connman-vpn.service.in \ - vpn/net.connman.vpn.service.in + vpn/net.connman.vpn.service.in \ + src/connman-wait-online.service.in service_files = src/connman.service src/net.connman.service \ vpn/connman-vpn.service \ - vpn/net.connman.vpn.service + vpn/net.connman.vpn.service \ + src/connman-wait-online.service plugin_LTLIBRARIES = @@ -95,9 +104,9 @@ unit_objects = MANUAL_PAGES = -sbin_PROGRAMS = src/connmand +sbin_PROGRAMS = src/connmand src/connmand-wait-online -src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \ +src_connmand_SOURCES = $(gdhcp_sources) $(gweb_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 \ @@ -111,18 +120,33 @@ 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/stats.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/ipv6pd.c src/peer.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@ \ + @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \ -lresolv -ldl -lrt src_connmand_LDFLAGS = -Wl,--export-dynamic \ -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 \ + @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@ +endif + if VPN vpn_plugin_LTLIBRARIES = @@ -135,7 +159,7 @@ builtin_vpn_cflags = sbin_PROGRAMS += vpn/connman-vpnd -vpn_connman_vpnd_SOURCES = $(builtin_vpn_sources) \ +vpn_connman_vpnd_SOURCES = $(builtin_vpn_sources) $(backtrace_sources) \ $(gweb_sources) vpn/vpn.ver vpn/main.c vpn/vpn.h \ src/log.c src/error.c src/plugin.c src/task.c \ vpn/vpn-manager.c vpn/vpn-provider.c \ @@ -153,7 +177,8 @@ 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 scripts/connman_resolvconf.conf if VPN BUILT_SOURCES += vpn/builtin.h @@ -161,8 +186,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 @@ -191,7 +216,7 @@ build_vpn_plugindir = $(vpn_plugindir) endif endif -AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \ @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ @@ -208,7 +233,7 @@ else AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus endif -src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ +src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \ @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ @@ -237,6 +262,16 @@ vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \ endif +if XTABLES +AM_CFLAGS += @XTABLES_CFLAGS@ +src_connmand_CFLAGS += @XTABLES_CFLAGS@ +endif + +if NFTABLES +AM_CFLAGS += @NFTABLES_CFLAGS@ +src_connmand_CFLAGS += @NFTABLES_CFLAGS@ +endif + EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf script_DATA = @@ -248,8 +283,6 @@ 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 \ @@ -265,8 +298,8 @@ 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 @@ -284,9 +317,9 @@ 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/session-test \ tools/dnsproxy-test tools/netlink-test tools_supplicant_test_SOURCES = tools/supplicant-test.c \ @@ -317,28 +350,34 @@ tools_dbus_test_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ tools_polkit_test_LDADD = @DBUS_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_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_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 +if XTABLES +noinst_PROGRAMS += tools/iptables-test tools/iptables-unit + +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_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_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 +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_SOURCES = $(shared_sources) tools/netlink-test.c tools_netlink_test_LDADD = @GLIB_LIBS@ endif @@ -380,14 +419,23 @@ 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 + src/eduroam.config \ + scripts/connman_resolvconf.conf.in -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 @@ -410,9 +458,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 @@ -429,6 +479,7 @@ if POLKIT else $(AM_V_GEN)cp $(srcdir)/vpn/vpn-dbus.conf $@ endif +CLEANFILES += vpn/connman-vpn-dbus.conf endif if SELINUX @@ -446,12 +497,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 @@ -463,4 +536,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) |