projects / framework / connectivity / connman.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove unpaired Bluetooth devices
[framework/connectivity/connman.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 59de002..ed4689c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,8 @@ include_HEADERS = include/types.h include/log.h include/plugin.h \
                        include/security.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/device.h include/network.h include/inet.h \
+                       include/ondemand.h
 
 nodist_include_HEADERS = include/version.h
 
@@ -15,7 +16,8 @@ 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/utsname.h include/timeserver.h \
+                       include/location.h include/technology.h
 
 local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
                        $(noinst_HEADERS), include/connman/$(notdir $(file)))
@@ -23,6 +25,12 @@ local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
 
 gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/object.c gdbus/watch.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
+
 if DATAFILES
 dbusdir = @DBUS_DATADIR@
 
@@ -42,7 +50,8 @@ noinst_PROGRAMS =
 
 sbin_PROGRAMS = src/connmand
 
-src_connmand_SOURCES = $(gdbus_sources) $(builtin_sources) \
+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/error.c src/plugin.c src/task.c src/element.c \
                        src/device.c src/network.c src/connection.c \
@@ -50,8 +59,11 @@ src_connmand_SOURCES = $(gdbus_sources) $(builtin_sources) \
                        src/agent.c src/notifier.c src/provider.c \
                        src/security.c src/resolver.c src/ipconfig.c \
                        src/ipv4.c src/dhcp.c src/rtnl.c src/inet.c \
-                       src/utsname.c src/rfkill.c src/wifi.c \
-                       src/storage.c src/dbus.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
@@ -59,8 +71,8 @@ else
 src_connmand_SOURCES += src/udev-compat.c
 endif
 
-src_connmand_LDADD = $(builtin_libadd) \
-                       @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ @UDEV_LIBS@ -ldl
+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
 
@@ -85,9 +97,8 @@ build_plugindir = $(plugindir)
 build_scriptdir = $(scriptdir)
 endif
 
-AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
+AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
                        @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \
-                               @GLIB_CFLAGS@ $(builtin_cflags) \
                                -DCONNMAN_PLUGIN_BUILTIN \
                                -DSTATEDIR=\""$(statedir)"\" \
                                -DPLUGINDIR=\""$(build_plugindir)"\" \
@@ -113,22 +124,62 @@ client_cm_LDADD = @DBUS_LIBS@
 endif
 
 if TOOLS
-noinst_PROGRAMS += tools/wifi-scan tools/addr-test tools/tap-test \
-                                                       tools/polkit-test
+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_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_supplicant_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c
+tools_web_test_LDADD = @GLIB_LIBS@
+
+tools_resolv_test_SOURCES = $(gresolv_sources) tools/resolv-test.c
+tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv
+
+tools_wpad_test_SOURCES = $(gresolv_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_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-service test/monitor-services \
-               test/select-connection test/list-devices test/enable-device \
-               test/disable-device test/start-scanning test/list-networks \
+               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/simple-agent test/show-introspection test/test-compat \
                test/test-manager test/test-connman test/monitor-connman \
-               test/debug-connman
+               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/get-proxy-autoconfig \
+               test/enable-tethering test/disable-tethering
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -141,8 +192,11 @@ 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/device-lowlevel-api.txt \
-                               doc/network-lowlevel-api.txt
+                               doc/network-lowlevel-api.txt \
+                               doc/advanced-configuration.txt \
+                               doc/config-format.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -155,14 +209,15 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-wifi \
                                --enable-bluetooth \
                                --enable-ofono \
-                               --enable-udhcp \
                                --enable-dhclient \
-                               --enable-resolvconf \
                                --enable-dnsproxy \
-                               --enable-hso \
-                               --enable-mbm \
+                               --enable-google \
+                               --enable-meego \
                                --enable-udev \
                                --enable-client \
+                               --enable-portal \
+                               --enable-hh2serial-gps \
+                               --enable-ntpd \
                                --enable-tools
 
 DISTCLEANFILES = $(pkgconfig_DATA)
@@ -179,7 +234,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
 
 src/connman.exp: $(src_connmand_OBJECTS)
        $(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \
-                               $(EGREP) -e '^connman_' -e '^g_dbus_' > $@
+               $(EGREP) -e '^connman_' -e '^g_dbus_' -e '^g_dhcp_' > $@
 
 src/connman.ver: src/connman.exp
        $(AM_V_at)echo "{ global:" > $@
@@ -203,5 +258,5 @@ include/connman/%.h: include/%.h
        $(AM_V_at)$(MKDIR_P) include/connman
        $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
 
-clean-local: include/connman
-       @$(RM) -r $<
+clean-local:
+       @$(RM) -rf include/connman
Domain: Network & Connectivity / Data Network;