notifier: Add proxy changed hook

[platform/upstream/connman.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index badab1c..4cbff38 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,8 @@ local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
 gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
                                        gdbus/object.c gdbus/polkit.c
 
-gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c
+gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c \
+               gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.c
 
 gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c \
                                        gweb/giognutls.h gweb/giognutls.c
@@ -61,7 +62,7 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
                        gweb/gresolv.h gweb/gresolv.c \
                        gweb/giognutls.h gweb/gionotls.c \
                        $(builtin_sources) src/connman.ver \
-                       src/main.c src/connman.h src/log.c src/selftest.c \
+                       src/main.c src/connman.h src/log.c \
                        src/error.c src/plugin.c src/task.c src/element.c \
                        src/device.c src/network.c src/connection.c \
                        src/manager.c src/profile.c src/service.c \
@@ -127,11 +128,11 @@ endif
 
 if TOOLS
 noinst_PROGRAMS += tools/wispr tools/wifi-scan tools/supplicant-test \
-                       tools/dhcp-test tools/addr-test \
-                       tools/web-test tools/resolv-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/stats-ringbuffer-dump
+                       tools/stats-tool
 
 tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
 tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
@@ -152,25 +153,20 @@ tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv
 tools_wpad_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/wpad-test.c
 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_server_test_SOURCES = $(gdhcp_sources) tools/dhcp-server-test.c
+tools_dhcp_server_test_LDADD = @GLIB_LIBS@
+
 tools_dbus_test_SOURCES = $(gdbus_sources) tools/dbus-test.c
 tools_dbus_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
 tools_polkit_test_LDADD = @DBUS_LIBS@
 
 tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@
-
-if DHCLIENT
-noinst_PROGRAMS += tools/dhclient-test
-
-tools_dhclient_test_SOURCES = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
-                                                       tools/dhclient-test.c
-tools_dhclient_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
-
-tools_dhclient_test_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\"
-endif
 endif
 
 test_scripts = test/get-state test/list-profiles test/list-services \
@@ -178,8 +174,8 @@ test_scripts = test/get-state test/list-profiles test/list-services \
                test/set-address test/test-profile \
                test/simple-agent test/show-introspection test/test-compat \
                test/test-manager test/test-connman test/monitor-connman \
-               test/connect-vpn test/disconnect-vpn test/list-providers \
-               test/monitor-manager test/test-counter test/set-ip-method \
+               test/connect-vpn test/disconnect-vpn test/monitor-manager \
+               test/test-counter test/set-ipv4-method test/set-ipv6-method \
                test/set-nameservers test/set-domains test/find-service \
                test/get-services test/get-proxy-autoconfig test/set-proxy \
                test/enable-tethering test/disable-tethering test/backtrace
@@ -210,7 +206,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-wifi \
                                --enable-bluetooth \
                                --enable-ofono \
-                               --enable-dhclient \
                                --enable-dnsproxy \
                                --enable-pacrunner \
                                --enable-google \