X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=511f088d45863886dda6137a8ed324e52a86aaed;hb=3889170e7e5adb01b024470ba41e4a24a1a24187;hp=8040b06032576b09dcb4028bf52de34f894f0210;hpb=378de73cbf88e5522fe0102c6a913a5ddb55e84c;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/Makefile.am b/Makefile.am
index 8040b06..511f088 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,9 @@ 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/profile.h include/provider.h include/dhcp.h \
+			include/utsname.h include/timeserver.h \
+			include/location.h
 
 local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
 			$(noinst_HEADERS), include/connman/$(notdir $(file)))
@@ -48,8 +50,11 @@ src_connmand_SOURCES = $(gdbus_sources) $(builtin_sources) \
 			src/manager.c src/profile.c src/service.c \
 			src/agent.c src/notifier.c src/provider.c \
 			src/security.c src/resolver.c src/ipconfig.c \
-			src/ipv4.c src/storage.c src/rfkill.c src/rtnl.c \
-			src/inet.c src/wifi.c src/dbus.c
+			src/ipv4.c src/dhcp.c src/rtnl.c src/inet.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
 
 if UDEV
 src_connmand_SOURCES += src/udev.c
@@ -58,7 +63,7 @@ src_connmand_SOURCES += src/udev-compat.c
 endif
 
 src_connmand_LDADD = $(builtin_libadd) \
-				@GLIB_LIBS@ @DBUS_LIBS@ @UDEV_LIBS@ -ldl
+			@GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ @UDEV_LIBS@ -ldl
 
 src_connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=src/connman.ver
 
@@ -83,8 +88,8 @@ build_plugindir = $(plugindir)
 build_scriptdir = $(scriptdir)
 endif
 
-AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @DBUS_CFLAGS@ \
-				@GLIB_CFLAGS@ $(builtin_cflags) \
+AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
+			@DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \
 				-DCONNMAN_PLUGIN_BUILTIN \
 				-DSTATEDIR=\""$(statedir)"\" \
 				-DPLUGINDIR=\""$(build_plugindir)"\" \
@@ -110,19 +115,38 @@ client_cm_LDADD = @DBUS_LIBS@
 endif
 
 if TOOLS
-noinst_PROGRAMS += tools/wifi-scan tools/addr-test tools/tap-test
+noinst_PROGRAMS += tools/wifi-scan tools/supplicant-test tools/dbus-test \
+			tools/addr-test tools/tap-test tools/resolv-test \
+					tools/polkit-test tools/portal-test
 
 tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
+
+tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
+			tools/supplicant-dbus.h tools/supplicant-dbus.c \
+			tools/supplicant.h tools/supplicant.c
+tools_supplicant_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+tools_dbus_test_SOURCES = $(gdbus_sources) tools/dbus-test.c
+tools_dbus_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+tools_resolv_test_LDADD = -lresolv
+
+tools_polkit_test_LDADD = @DBUS_LIBS@
+
+tools_portal_test_LDADD = @GLIB_LIBS@
 endif
 
 test_scripts = test/get-state test/list-profiles test/list-services \
-		test/connect-service test/list-connections \
-		test/select-connection test/list-devices test/enable-device \
-		test/disable-device test/start-scanning test/list-networks \
+		test/connect-service test/monitor-services \
+		test/list-devices test/enable-device test/disable-device \
+		test/start-scanning test/list-networks \
 		test/set-passphrase 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/monitor-services test/debug-connman
+		test/connect-vpn test/disconnect-vpn test/list-providers \
+		test/monitor-manager test/test-counter test/set-ip-method \
+		test/set-nameservers test/set-domains test/find-service \
+		test/get-services
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -135,9 +159,11 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
 				doc/ipconfig-api.txt doc/plugin-api.txt \
 				doc/manager-api.txt doc/agent-api.txt \
 				doc/profile-api.txt doc/service-api.txt \
+				doc/technology-api.txt doc/counter-api.txt \
 				doc/device-lowlevel-api.txt \
 				doc/network-lowlevel-api.txt \
-				doc/connection-lowlevel-api.txt
+				doc/advanced-configuration.txt \
+				doc/config-format.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -154,11 +180,12 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
 				--enable-dhclient \
 				--enable-resolvconf \
 				--enable-dnsproxy \
-				--enable-hso \
-				--enable-mbm \
+				--enable-google \
+				--enable-meego \
 				--enable-udev \
-				--enable-polkit \
 				--enable-client \
+				--enable-portal \
+				--enable-hh2serial-gps \
 				--enable-tools
 
 DISTCLEANFILES = $(pkgconfig_DATA)