X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=3ad1ee93a1b4f1a9b8e5141baa101cd7dcfee1e5;hb=21dcc676a11701d0013d20c45636d2809b439db9;hp=f5158ed8ca31380bccc4076f3d3d5335a26e5562;hpb=d6b6fb3003a42e857fbd969e0ccfc771f4fc8398;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/Makefile.am b/Makefile.am
index f5158ed..3ad1ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,16 +7,15 @@ 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/utsname.h include/timeserver.h \
+			include/profile.h include/provider.h \
+			include/utsname.h include/timeserver.h include/proxy.h \
 			include/location.h include/technology.h
 
 local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
@@ -26,19 +25,27 @@ local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
 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_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c \
+		gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.c
 
-gresolv_sources = gresolv/gresolv.h gresolv/gresolv.c
+gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c \
+					gweb/giognutls.h gweb/giognutls.c
 
-gweb_sources = gweb/gweb.h gweb/gweb.c
+if DATAFILES
 
-gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \
-			gsupplicant/supplicant.c gsupplicant/dbus.c
+if NMCOMPAT
+nmcompat_conf = plugins/connman-nmcompat.conf
+endif
 
-if DATAFILES
-dbusdir = @DBUS_DATADIR@
+dbusconfdir = @DBUS_CONFDIR@
 
-dbus_DATA = src/connman.conf
+dbusconf_DATA = src/connman.conf $(nmcompat_conf)
+
+if SYSTEMD
+systemdunitdir = @SYSTEMD_UNITDIR@
+
+systemdunit_DATA = src/connman.service
+endif
 endif
 
 plugin_LTLIBRARIES =
@@ -54,40 +61,31 @@ noinst_PROGRAMS =
 
 sbin_PROGRAMS = src/connmand
 
-src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(gresolv_sources) \
-					$(gweb_sources) $(builtin_sources) \
-			src/main.c src/connman.h src/log.c src/selftest.c \
+src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
+			gweb/gweb.h gweb/gweb.c \
+			gweb/gresolv.h gweb/gresolv.c \
+			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/device.c src/network.c src/connection.c \
 			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/ipv4.c src/dhcp.c src/rtnl.c src/inet.c \
+			src/resolver.c src/ipconfig.c src/detect.c src/inet.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
-
-if UDEV
-src_connmand_SOURCES += src/udev.c
-else
-src_connmand_SOURCES += src/udev-compat.c
-endif
-
-if WIFI
-src_connmand_SOURCES += $(gsupplicant_sources)
-endif
+			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@ @UDEV_LIBS@ -lresolv -ldl
+				@CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl
 
-src_connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=src/connman.ver
+src_connmand_LDFLAGS = -Wl,--export-dynamic \
+				-Wl,--version-script=$(srcdir)/src/connman.ver
 
-src_connmand_DEPENDENCIES = src/connman.ver
-
-CLEANFILES = src/connman.ver src/connman.exp src/connman.conf \
-						src/builtin.h $(local_headers)
+CLEANFILES = src/connman.conf src/builtin.h $(local_headers)
 
 statedir = $(localstatedir)/run/connman
 
@@ -105,8 +103,9 @@ build_plugindir = $(plugindir)
 build_scriptdir = $(scriptdir)
 endif
 
-AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
-			@DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
+				@NETLINK_CFLAGS@ @GNUTLS_CFLAGS@ \
+				$(builtin_cflags) \
 				-DCONNMAN_PLUGIN_BUILTIN \
 				-DSTATEDIR=\""$(statedir)"\" \
 				-DPLUGINDIR=\""$(build_plugindir)"\" \
@@ -115,7 +114,8 @@ AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_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 =
@@ -132,10 +132,15 @@ client_cm_LDADD = @DBUS_LIBS@
 endif
 
 if TOOLS
-noinst_PROGRAMS += tools/wifi-scan tools/supplicant-test tools/dhcp-test \
+noinst_PROGRAMS += tools/wispr tools/wifi-scan tools/supplicant-test \
+			tools/dhcp-test tools/dhcp-server-test \
 			tools/addr-test tools/web-test tools/resolv-test \
-			tools/dbus-test tools/polkit-test tools/portal-test \
-			tools/iptables-test tools/tap-test tools/wpad-test
+			tools/dbus-test tools/polkit-test \
+			tools/iptables-test tools/tap-test tools/wpad-test \
+			tools/stats-tool
+
+tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
+tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
 
 tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
 
@@ -145,48 +150,39 @@ tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
 tools_supplicant_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
 tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c
-tools_web_test_LDADD = @GLIB_LIBS@
+tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
 
-tools_resolv_test_SOURCES = $(gresolv_sources) tools/resolv-test.c
+tools_resolv_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/resolv-test.c
 tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv
 
-tools_wpad_test_SOURCES = $(gresolv_sources) tools/wpad-test.c
+tools_wpad_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/wpad-test.c
 tools_wpad_test_LDADD = @GLIB_LIBS@ -lresolv
 
+tools_stats_tool_LDADD = @GLIB_LIBS@
+
 tools_dhcp_test_SOURCES = $(gdhcp_sources) tools/dhcp-test.c
 tools_dhcp_test_LDADD = @GLIB_LIBS@
 
+tools_dhcp_server_test_SOURCES = $(gdhcp_sources) tools/dhcp-server-test.c
+tools_dhcp_server_test_LDADD = @GLIB_LIBS@
+
 tools_dbus_test_SOURCES = $(gdbus_sources) tools/dbus-test.c
 tools_dbus_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
 tools_polkit_test_LDADD = @DBUS_LIBS@
 
-tools_portal_test_LDADD = @GLIB_LIBS@
-
-tools_iptables_test_LDADD = @IPTC_LIBS@ -lip4tc -lxtables
-
-if DHCLIENT
-noinst_PROGRAMS += tools/dhclient-test
-
-tools_dhclient_test_SOURCES = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
-							tools/dhclient-test.c
-tools_dhclient_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
-
-tools_dhclient_test_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\"
-endif
+tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@
 endif
 
 test_scripts = test/get-state test/list-profiles test/list-services \
 		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/set-address test/test-profile \
 		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/list-providers \
-		test/monitor-manager test/test-counter test/set-ip-method \
+		test/connect-vpn test/disconnect-vpn test/monitor-manager \
+		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/get-services test/get-proxy-autoconfig test/set-proxy \
 		test/enable-tethering test/disable-tethering test/backtrace
 
 if TEST
@@ -201,8 +197,6 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-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/advanced-configuration.txt \
 				doc/config-format.txt
 
@@ -217,16 +211,14 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
 				--enable-wifi \
 				--enable-bluetooth \
 				--enable-ofono \
-				--enable-dhclient \
-				--enable-dnsproxy \
 				--enable-pacrunner \
 				--enable-google \
 				--enable-meego \
-				--enable-udev \
 				--enable-client \
 				--enable-portal \
 				--enable-hh2serial-gps \
 				--enable-ntpd \
+				--enable-openconnect \
 				--enable-tools
 
 DISTCLEANFILES = $(pkgconfig_DATA)
@@ -241,15 +233,6 @@ src/plugin.$(OBJEXT): src/builtin.h
 src/builtin.h: src/genbuiltin $(builtin_sources)
 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
 
-src/connman.exp: $(src_connmand_OBJECTS)
-	$(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \
-		$(EGREP) -e '^connman_' -e '^g_dbus_' -e '^g_dhcp_' > $@
-
-src/connman.ver: src/connman.exp
-	$(AM_V_at)echo "{ global:" > $@
-	$(AM_V_GEN)$(SED) -e "s/\(.*\)/\1;/" $< >> $@
-	$(AM_V_at)echo "local: *; };" >> $@
-
 src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf
 if POLKIT
 	$(AM_V_GEN)cp $(srcdir)/src/connman-polkit.conf $@