includedir = @includedir@/connman
include_HEADERS = include/types.h include/log.h include/plugin.h \
- include/notifier.h \
- include/storage.h include/service.h \
+ include/notifier.h include/service.h \
include/resolver.h include/ipconfig.h \
include/device.h include/network.h include/inet.h \
- include/ondemand.h
+ include/storage.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/task.h \
include/dbus.h include/rfkill.h include/option.h \
- include/profile.h include/provider.h include/dhcp.h \
+ include/provider.h \
include/utsname.h include/timeserver.h include/proxy.h \
- include/location.h include/technology.h
+ include/technology.h include/setting.h
local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
$(noinst_HEADERS), include/connman/$(notdir $(file)))
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@
noinst_PROGRAMS =
+unit_objects =
+
sbin_PROGRAMS = src/connmand
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/manager.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/ondemand.c \
- src/wpad.c src/wispr.c src/stats.c src/iptables.c
+ src/storage.c src/dbus.c src/config.c \
+ src/technology.c src/counter.c src/ntp.c \
+ src/session.c src/tethering.c src/wpad.c src/wispr.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
src_connmand_LDFLAGS = -Wl,--export-dynamic \
-Wl,--version-script=$(srcdir)/src/connman.ver
-CLEANFILES = src/connman.conf src/builtin.h $(local_headers)
+BUILT_SOURCES = $(local_headers)
+
+CLEANFILES = src/connman.conf src/builtin.h $(BUILT_SOURCES)
statedir = $(localstatedir)/run/connman
storagedir = $(localstatedir)/lib/connman
+configdir = ${sysconfdir}/connman
+
if MAINTAINER_MODE
build_plugindir = $(abs_top_srcdir)/plugins/.libs
build_scriptdir = $(abs_top_srcdir)/scripts
endif
AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
- @NETLINK_CFLAGS@ @GNUTLS_CFLAGS@ \
- $(builtin_cflags) \
+ @GNUTLS_CFLAGS@ $(builtin_cflags) \
-DCONNMAN_PLUGIN_BUILTIN \
-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 =
endif
if TOOLS
-noinst_PROGRAMS += tools/wispr tools/wifi-scan tools/supplicant-test \
+noinst_PROGRAMS += tools/wispr 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/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
-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_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 \
- test/connect-service test/monitor-services \
- test/set-address test/test-profile \
+ test/connect-service test/monitor-services test/set-address \
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/monitor-manager \
- test/test-counter test/set-ip-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/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/test-session test/provision-service
if TEST
testdir = $(pkglibdir)/test
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
--enable-wifi \
--enable-bluetooth \
--enable-ofono \
- --enable-dnsproxy \
--enable-pacrunner \
--enable-google \
--enable-meego \
--enable-client \
- --enable-portal \
--enable-hh2serial-gps \
--enable-ntpd \
--enable-openconnect \
$(AM_V_GEN)cp $(srcdir)/src/connman-dbus.conf $@
endif
-$(src_connmand_OBJECTS) $(plugin_objects): $(local_headers)
-
include/connman/version.h: include/version.h
$(AM_V_at)$(MKDIR_P) include/connman
$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
-include/connman/%.h: include/%.h
+include/connman/%.h: $(abs_top_srcdir)/include/%.h
$(AM_V_at)$(MKDIR_P) include/connman
- $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+ $(AM_V_GEN)$(LN_S) $< $@
clean-local:
@$(RM) -rf include/connman