client: Add ReportError handling

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

diff --git a/Makefile.am b/Makefile.am
index 78b1b33..04677ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,16 +226,15 @@ 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) src/connman.h \
-                       client/dbus.h client/dbus.c \
-                       client/data_manager.h client/data_manager.c \
+client_connmanctl_SOURCES =  $(gdbus_sources) \
+                       client/dbus_helpers.h client/dbus_helpers.c \
                        client/services.h client/services.c \
-                       client/technology.h client/technology.c \
-                       client/interactive.h client/interactive.c \
-                       client/monitor.h client/monitor.c \
-                       client/commands.c client/main.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
 endif
@@ -270,7 +269,8 @@ noinst_PROGRAMS += tools/supplicant-test \
                        tools/dbus-test tools/polkit-test \
                        tools/iptables-test tools/tap-test tools/wpad-test \
                        tools/stats-tool tools/private-network-test \
-                       tools/session-test tools/iptables-unit
+                       tools/session-test tools/iptables-unit \
+                       tools/dnsproxy-test
 
 tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
                        tools/supplicant-dbus.h tools/supplicant-dbus.c \
@@ -315,6 +315,9 @@ 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_test_SOURCES = tools/dnsproxy-test.c
+tools_dnsproxy_test_LDADD = @GLIB_LIBS@
+
 endif
 
 test_scripts = test/get-state test/list-services \
@@ -351,9 +354,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