X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=ac3999bc7706b7f665beadaae74dc8d7819e17b9;hb=4d6fdeeb29d9c78ce99f54c6f7d01e6177706cad;hp=67b2c2972aba8df964f29eb25f9d5856ad7a27be;hpb=1ffd50749f3ae71bd87a6355b64f09575173868a;p=platform%2Fupstream%2Fconnman.git

diff --git a/Makefile.am b/Makefile.am
index 67b2c29..ac3999b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,12 +11,12 @@ include_HEADERS = include/types.h include/log.h include/plugin.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 \
+noinst_HEADERS = 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/utsname.h include/timeserver.h include/proxy.h \
-			include/location.h include/technology.h
+			include/location.h include/technology.h \
+			include/setting.h
 
 local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
 			$(noinst_HEADERS), include/connman/$(notdir $(file)))
@@ -32,9 +32,14 @@ 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@
@@ -54,6 +59,8 @@ builtin_cflags =
 
 noinst_PROGRAMS =
 
+unit_objects =
+
 sbin_PROGRAMS = src/connmand
 
 src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
@@ -62,17 +69,18 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
 			gweb/giognutls.h gweb/gionotls.c \
 			$(builtin_sources) src/connman.ver \
 			src/main.c src/connman.h src/log.c \
-			src/error.c src/plugin.c src/task.c src/element.c \
+			src/error.c src/plugin.c src/task.c \
 			src/device.c src/network.c src/connection.c \
 			src/manager.c src/profile.c src/service.c \
+			src/clock.c src/timezone.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/wpad.c src/wispr.c \
-			src/stats.c src/iptables.c src/dnsproxy.c
+			src/stats.c src/iptables.c src/dnsproxy.c src/6to4.c
 
 src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
 				@CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl
@@ -90,6 +98,8 @@ scriptdir = $(libdir)/connman/scripts
 
 storagedir = $(localstatedir)/lib/connman
 
+configdir = ${sysconfdir}/connman
+
 if MAINTAINER_MODE
 build_plugindir = $(abs_top_srcdir)/plugins/.libs
 build_scriptdir = $(abs_top_srcdir)/scripts
@@ -105,11 +115,13 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
 				-DSTATEDIR=\""$(statedir)"\" \
 				-DPLUGINDIR=\""$(build_plugindir)"\" \
 				-DSCRIPTDIR=\""$(build_scriptdir)"\" \
-				-DSTORAGEDIR=\""$(storagedir)\""
+				-DSTORAGEDIR=\""$(storagedir)\"" \
+				-DCONFIGDIR=\""$(configdir)\""
 
 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 =
@@ -131,7 +143,8 @@ noinst_PROGRAMS += tools/wispr tools/wifi-scan tools/supplicant-test \
 			tools/addr-test tools/web-test tools/resolv-test \
 			tools/dbus-test tools/polkit-test \
 			tools/iptables-test tools/tap-test tools/wpad-test \
-			tools/stats-tool
+			tools/stats-tool tools/private-network-test \
+			tools/alg-test unit/test-session
 
 tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
 tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
@@ -166,6 +179,16 @@ tools_dbus_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 tools_polkit_test_LDADD = @DBUS_LIBS@
 
 tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@
+
+tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+tools_alg_test_LDADD = @GLIB_LIBS@
+
+unit_test_session_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
+		unit/test-session.c unit/utils.c unit/manager-api.c \
+		unit/session-api.c unit/test-connman.h
+unit_test_session_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+unit_objects += $(unit_test_session_OBJECTS)
 endif
 
 test_scripts = test/get-state test/list-profiles test/list-services \
@@ -177,7 +200,8 @@ test_scripts = test/get-state test/list-profiles test/list-services \
 		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
+		test/enable-tethering test/disable-tethering test/backtrace \
+		test/test-session test/provision-service
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -189,10 +213,10 @@ EXTRA_DIST += $(test_scripts)
 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/advanced-configuration.txt \
-				doc/config-format.txt
+				doc/service-api.txt doc/technology-api.txt \
+				doc/counter-api.txt doc/config-format.txt \
+				doc/advanced-configuration.txt
+
 
 pkgconfigdir = $(libdir)/pkgconfig