gdbus: Unconditionally remove D-Bus timeouts

[framework/connectivity/connman.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 444c48a..3ad1ee9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,15 +7,14 @@ include_HEADERS = include/types.h include/log.h include/plugin.h \
                        include/notifier.h \
                        include/storage.h include/service.h \
                        include/resolver.h include/ipconfig.h \
-                       include/device.h include/network.h include/inet.h \
-                       include/ondemand.h
+                       include/device.h include/network.h include/inet.h
 
 nodist_include_HEADERS = include/version.h
 
 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/profile.h include/provider.h \
                        include/utsname.h include/timeserver.h include/proxy.h \
                        include/location.h include/technology.h
 
@@ -27,15 +26,20 @@ 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/server.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
 
 if DATAFILES
+
+if NMCOMPAT
+nmcompat_conf = plugins/connman-nmcompat.conf
+endif
+
 dbusconfdir = @DBUS_CONFDIR@
 
-dbusconf_DATA = src/connman.conf
+dbusconf_DATA = src/connman.conf $(nmcompat_conf)
 
 if SYSTEMD
 systemdunitdir = @SYSTEMD_UNITDIR@
@@ -68,12 +72,12 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
                        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/inet.c \
-                       src/ipv4.c src/dhcp.c src/rtnl.c src/proxy.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 \
-                       src/session.c src/tethering.c src/ondemand.c \
-                       src/wpad.c src/wispr.c src/stats.c src/iptables.c
+                       src/session.c src/tethering.c src/wpad.c src/wispr.c \
+                       src/stats.c src/iptables.c src/dnsproxy.c
 
 src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
                                @CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl
@@ -110,7 +114,8 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
 
 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 
-EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf
+EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf \
+               plugins/connman-nmcompat.conf
 
 
 script_DATA =
@@ -175,9 +180,9 @@ test_scripts = test/get-state test/list-profiles test/list-services \
                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/monitor-manager \
-               test/test-counter test/set-ip-method test/set-nameservers \
-               test/set-domains test/find-service test/get-services \
-               test/get-proxy-autoconfig test/set-proxy \
+               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
 
 if TEST
@@ -206,7 +211,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-wifi \
                                --enable-bluetooth \
                                --enable-ofono \
-                               --enable-dnsproxy \
                                --enable-pacrunner \
                                --enable-google \
                                --enable-meego \