diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 77 |
1 files changed, 57 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index e67a7a55..745bef05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,8 @@ 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 nodist_include_HEADERS = include/version.h @@ -32,8 +33,12 @@ 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 + gdhcp/server.c gdhcp/unaligned.h gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c @@ -43,12 +48,15 @@ else gweb_sources += gweb/giognutls.h gweb/gionotls.c endif -if BACKTRACE -backtrace_sources = src/backtrace.c +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/netlink.h src/shared/netlink.c \ + src/shared/arp.h src/shared/arp.c if DATAFILES @@ -106,9 +114,9 @@ MANUAL_PAGES = sbin_PROGRAMS = src/connmand src/connmand-wait-online -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_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 \ @@ -120,10 +128,17 @@ src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) $(backtrace_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/dnsproxy.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/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 src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \ @@ -178,7 +193,11 @@ vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \ endif BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) \ - scripts/connman scripts/connman_resolvconf.conf + scripts/connman + +if INTERNAL_DNS_BACKEND +BUILT_SOURCES += scripts/connman_resolvconf.conf +endif if VPN BUILT_SOURCES += vpn/builtin.h @@ -289,6 +308,7 @@ client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.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 @@ -339,11 +359,13 @@ 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@ @@ -359,25 +381,40 @@ tools_session_test_LDADD = gdbus/libgdbus-internal.la \ @GLIB_LIBS@ @DBUS_LIBS@ -ldl if XTABLES -noinst_PROGRAMS += tools/iptables-test tools/iptables-unit +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}"\" + -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 + +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_SOURCES = src/shared/util.c src/shared/netlink.c \ + tools/netlink-test.c tools_netlink_test_LDADD = @GLIB_LIBS@ endif |