tethering: Fix for default interface string double free

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

diff --git a/Makefile.am b/Makefile.am
index e07a499..cba6b9c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = include/driver.h include/element.h include/property.h \
                        include/rtnl.h include/wifi.h include/task.h \
                        include/dbus.h include/rfkill.h include/option.h \
                        include/profile.h include/provider.h include/dhcp.h \
-                       include/utsname.h include/timeserver.h \
+                       include/utsname.h include/timeserver.h include/proxy.h \
                        include/location.h include/technology.h
 
 local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
@@ -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
 
 gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c \
                                        gweb/giognutls.h gweb/giognutls.c
@@ -66,8 +67,8 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
                        src/device.c src/network.c src/connection.c \
                        src/manager.c src/profile.c src/service.c \
                        src/agent.c src/notifier.c src/provider.c \
-                       src/resolver.c src/ipconfig.c src/detect.c \
-                       src/ipv4.c src/dhcp.c src/rtnl.c src/inet.c \
+                       src/resolver.c src/ipconfig.c src/detect.c src/inet.c \
+                       src/ipv4.c src/dhcp.c src/rtnl.c src/proxy.c \
                        src/utsname.c src/timeserver.c src/rfkill.c \
                        src/wifi.c src/storage.c src/dbus.c src/config.c \
                        src/technology.c src/counter.c src/location.c \
@@ -126,10 +127,10 @@ client_cm_LDADD = @DBUS_LIBS@
 endif
 
 if TOOLS
-noinst_PROGRAMS += tools/wispr tools/wifi-scan \
-                       tools/supplicant-test tools/dhcp-test \
+noinst_PROGRAMS += tools/wispr tools/wifi-scan 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/portal-test \
+                       tools/dbus-test tools/polkit-test \
                        tools/iptables-test tools/tap-test tools/wpad-test \
                        tools/stats-ringbuffer-dump
 
@@ -155,13 +156,14 @@ tools_wpad_test_LDADD = @GLIB_LIBS@ -lresolv
 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_portal_test_LDADD = @GLIB_LIBS@
-
 tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@
 
 if DHCLIENT