session: Fix service2bearer to return a correct match all rule

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

diff --git a/Makefile.am b/Makefile.am
index dfe23b6..f05b755 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,13 +226,14 @@ include Makefile.plugins
 if CLIENT
 noinst_PROGRAMS += client/connmanctl
 
-MANUAL_PAGES += doc/connmanctl.1
+noinst_MANUAL_PAGES = doc/connmanctl.1
 
 client_connmanctl_SOURCES =  $(gdbus_sources) \
                        client/dbus_helpers.h client/dbus_helpers.c \
                        client/services.h client/services.c \
                        client/commands.h client/commands.c \
                        client/input.h client/input.c \
+                       client/agent.h client/agent.c \
                        client/main.c
 
 client_connmanctl_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ -lreadline -ldl
@@ -269,7 +270,7 @@ noinst_PROGRAMS += tools/supplicant-test \
                        tools/iptables-test tools/tap-test tools/wpad-test \
                        tools/stats-tool tools/private-network-test \
                        tools/session-test tools/iptables-unit \
-                       tools/dnsproxy-unit
+                       tools/dnsproxy-test
 
 tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
                        tools/supplicant-dbus.h tools/supplicant-dbus.c \
@@ -314,8 +315,8 @@ tools_iptables_unit_SOURCES = $(gdbus_sources) src/log.c \
                 src/iptables.c src/firewall.c src/nat.c tools/iptables-unit.c
 tools_iptables_unit_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl
 
-tools_dnsproxy_unit_SOURCES = tools/dnsproxy-unit.c
-tools_dnsproxy_unit_LDADD = @GLIB_LIBS@
+tools_dnsproxy_test_SOURCES = tools/dnsproxy-test.c
+tools_dnsproxy_test_LDADD = @GLIB_LIBS@
 
 endif
 
@@ -330,7 +331,8 @@ test_scripts = test/get-state test/list-services \
                test/test-session test/test-supplicant \
                test/test-new-supplicant test/service-move-before \
                test/set-global-timeservers test/get-global-timeservers \
-               test/set-nameservers test/set-domains test/set-timeservers
+               test/set-nameservers test/set-domains test/set-timeservers \
+               test/set-clock
 
 test_scripts += test/vpn-connect test/vpn-disconnect test/vpn-get \
                test/monitor-vpn test/vpn-property
@@ -353,9 +355,11 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
                                doc/vpn-connection-api.txt \
                                doc/vpn-manager-api.txt doc/vpn-overview.txt
 
+EXTRA_DIST += src/main.conf
+
 MANUAL_PAGES += doc/connman.8 doc/connman.conf.5
 
-noinst_dist_man_MANS = $(MANUAL_PAGES)
+dist_man_MANS = $(MANUAL_PAGES)
 
 pkgconfigdir = $(libdir)/pkgconfig