includedir = @includedir@/connman
include_HEADERS = include/types.h include/log.h include/plugin.h \
- include/security.h include/notifier.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 \
$(noinst_HEADERS), include/connman/$(notdir $(file)))
-gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/object.c gdbus/watch.c
+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
-gresolv_sources = gresolv/gresolv.h gresolv/gresolv.c
+gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c
+
+gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \
+ gsupplicant/supplicant.c gsupplicant/dbus.c
if DATAFILES
-dbusdir = @DBUS_DATADIR@
+dbusconfdir = @DBUS_CONFDIR@
+
+dbusconf_DATA = src/connman.conf
-dbus_DATA = src/connman.conf
+if SYSTEMD
+systemdunitdir = @SYSTEMD_UNITDIR@
+
+systemdunit_DATA = src/connman.service
+endif
endif
plugin_LTLIBRARIES =
sbin_PROGRAMS = src/connmand
src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
- $(gresolv_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/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/resolver.c src/ipconfig.c src/detect.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 src/tethering.c src/ondemand.c
+ src/session.c src/tethering.c src/ondemand.c \
+ src/wpad.c src/stats.c
-if UDEV
-src_connmand_SOURCES += src/udev.c
-else
-src_connmand_SOURCES += src/udev-compat.c
+if WIFI
+src_connmand_SOURCES += $(gsupplicant_sources)
endif
-src_connmand_LDADD = $(builtin_libadd) \
- @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ @UDEV_LIBS@ -ldl
-
-src_connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=src/connman.ver
+src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
+ @CAPNG_LIBS@ -lresolv -ldl
-src_connmand_DEPENDENCIES = src/connman.ver
+src_connmand_LDFLAGS = -Wl,--export-dynamic \
+ -Wl,--version-script=$(srcdir)/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
build_scriptdir = $(scriptdir)
endif
-AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
+AM_CFLAGS = @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
@DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \
-DCONNMAN_PLUGIN_BUILTIN \
-DSTATEDIR=\""$(statedir)"\" \
if TOOLS
noinst_PROGRAMS += tools/wifi-scan tools/supplicant-test tools/dhcp-test \
- tools/addr-test tools/tap-test tools/resolv-test \
+ tools/addr-test tools/web-test tools/resolv-test \
tools/dbus-test tools/polkit-test tools/portal-test \
- tools/iptables-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@ -lresolv
+
+tools_resolv_test_SOURCES = $(gweb_sources) tools/resolv-test.c
+tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv
+
+tools_wpad_test_SOURCES = $(gweb_sources) tools/wpad-test.c
+tools_wpad_test_LDADD = @GLIB_LIBS@ -lresolv
+
tools_dhcp_test_SOURCES = $(gdhcp_sources) tools/dhcp-test.c
tools_dhcp_test_LDADD = @GLIB_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@
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
endif
test_scripts = test/get-state test/list-profiles test/list-services \
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 \
- test/enable-tethering test/disable-tethering
+ test/get-services test/get-proxy-autoconfig \
+ test/enable-tethering test/disable-tethering test/backtrace
if TEST
testdir = $(pkglibdir)/test
--enable-wifi \
--enable-bluetooth \
--enable-ofono \
- --enable-udhcp \
--enable-dhclient \
- --enable-resolvconf \
--enable-dnsproxy \
+ --enable-pacrunner \
--enable-google \
--enable-meego \
- --enable-udev \
--enable-client \
--enable-portal \
--enable-hh2serial-gps \
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 $@
projects / framework / connectivity / connman.git / blobdiff