gweb_sources = gweb/gweb.h gweb/gweb.c
+gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \
+ gsupplicant/supplicant.c gsupplicant/dbus.c
+
if DATAFILES
-dbusdir = @DBUS_DATADIR@
+dbusconfdir = @DBUS_CONFDIR@
-dbus_DATA = src/connman.conf
+dbusconf_DATA = src/connman.conf
endif
plugin_LTLIBRARIES =
sbin_PROGRAMS = src/connmand
src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(gresolv_sources) \
- $(gweb_sources) $(builtin_sources) \
+ $(gweb_sources) $(builtin_sources) src/connman.ver \
src/main.c src/connman.h src/log.c src/selftest.c \
src/error.c src/plugin.c src/task.c src/element.c \
src/device.c src/network.c src/connection.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/wpad.c src/stats.c
if UDEV
src_connmand_SOURCES += src/udev.c
src_connmand_SOURCES += src/udev-compat.c
endif
+if WIFI
+src_connmand_SOURCES += $(gsupplicant_sources)
+endif
+
src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
@CAPNG_LIBS@ @UDEV_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
noinst_PROGRAMS += tools/wifi-scan tools/supplicant-test tools/dhcp-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/iptables-test tools/tap-test tools/wpad-test \
+ tools/stats-ringbuffer-dump
tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
tools/supplicant.h tools/supplicant.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_SOURCES = $(gresolv_sources) $(gweb_sources) tools/web-test.c
+tools_web_test_LDADD = @GLIB_LIBS@ -lresolv
tools_resolv_test_SOURCES = $(gresolv_sources) tools/resolv-test.c
tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv
--enable-ofono \
--enable-dhclient \
--enable-dnsproxy \
+ --enable-pacrunner \
--enable-google \
--enable-meego \
--enable-udev \
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 $@