projects / framework / connectivity / connman.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
dnsproxy: Only one copy of the relevant buffers will be made to a TCP request
[framework/connectivity/connman.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 9c08453..9d713ae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,19 +4,18 @@ AM_MAKEFLAGS = --no-print-directory
 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/device.h include/network.h include/inet.h \
+                       include/storage.h
 
 nodist_include_HEADERS = include/version.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/dbus.h include/option.h \
+                       include/provider.h \
                        include/utsname.h include/timeserver.h include/proxy.h \
-                       include/location.h include/technology.h \
-                       include/setting.h
+                       include/technology.h include/setting.h
 
 local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
                        $(noinst_HEADERS), include/connman/$(notdir $(file)))
@@ -28,8 +27,13 @@ gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
 gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c \
                gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.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 gweb/gresolv.h gweb/gresolv.c
+
+if WISPR
+gweb_sources += gweb/giognutls.h gweb/giognutls.c
+else
+gweb_sources += gweb/giognutls.h gweb/gionotls.c
+endif
 
 if DATAFILES
 
@@ -63,34 +67,32 @@ unit_objects =
 
 sbin_PROGRAMS = src/connmand
 
-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 \
+src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(gweb_sources) \
                        $(builtin_sources) src/connman.ver \
                        src/main.c src/connman.h src/log.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/dhcp.c src/rtnl.c src/proxy.c \
+                       src/dhcp.c src/dhcpv6.c src/rtnl.c src/proxy.c \
                        src/utsname.c src/timeserver.c src/rfkill.c \
                        src/storage.c src/dbus.c src/config.c \
-                       src/technology.c src/counter.c src/location.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/stats.c src/iptables.c src/dnsproxy.c src/6to4.c \
+                       src/ippool.c src/bridge.c src/nat.c
 
 src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
-                               @CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl
+                               @XTABLES_LIBS@ @GNUTLS_LIBS@ -lresolv -ldl
 
 src_connmand_LDFLAGS = -Wl,--export-dynamic \
                                -Wl,--version-script=$(srcdir)/src/connman.ver
 
-BUILT_SOURCES = $(local_headers)
+BUILT_SOURCES = $(local_headers) src/builtin.h
 
-CLEANFILES = src/connman.conf src/builtin.h $(BUILT_SOURCES)
+CLEANFILES = src/connman.conf $(BUILT_SOURCES)
 
 statedir = $(localstatedir)/run/connman
 
@@ -110,7 +112,7 @@ build_plugindir = $(plugindir)
 build_scriptdir = $(scriptdir)
 endif
 
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
                                @GNUTLS_CFLAGS@ $(builtin_cflags) \
                                -DCONNMAN_PLUGIN_BUILTIN \
                                -DSTATEDIR=\""$(statedir)"\" \
@@ -122,7 +124,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 
 EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf \
-               plugins/connman-nmcompat.conf
+                                               plugins/connman-nmcompat.conf
 
 
 script_DATA =
@@ -138,17 +140,21 @@ client_cm_SOURCES = client/main.c
 client_cm_LDADD = @DBUS_LIBS@
 endif
 
+if WISPR
+noinst_PROGRAMS += tools/wispr
+
+tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
+tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
+endif
+
 if TOOLS
-noinst_PROGRAMS += tools/wispr tools/supplicant-test \
+noinst_PROGRAMS += 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/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
+                       unit/test-session unit/test-ippool unit/test-nat
 
 tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
                        tools/supplicant-dbus.h tools/supplicant-dbus.c \
@@ -181,25 +187,35 @@ 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_test_session_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
 unit_objects += $(unit_test_session_OBJECTS)
+
+unit_test_ippool_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
+                src/ippool.c unit/test-ippool.c
+unit_test_ippool_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
+unit_objects += $(unit_test_ippool_OBJECTS)
+
+unit_test_nat_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
+               src/iptables.c  src/nat.c unit/test-nat.c
+unit_test_nat_LDADD = @GLIB_LIBS@ @DBUS_LIBS@  @XTABLES_LIBS@ -ldl
+unit_objects += $(unit_nat_ippool_OBJECTS)
 endif
 
-test_scripts = test/get-state test/list-profiles test/list-services \
-               test/connect-service test/monitor-services test/set-address \
+test_scripts = test/get-state test/list-services \
+               test/monitor-services test/test-clock \
                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/connect-vpn test/disconnect-vpn \
                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
+               test/test-session test/test-supplicant \
+               test/test-new-supplicant test/service-move-before \
+               test/set-global-timeservers test/get-global-timeservers \
+               test/set-nameservers test/set-domains
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -213,6 +229,8 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
                                doc/manager-api.txt doc/agent-api.txt \
                                doc/service-api.txt doc/technology-api.txt \
                                doc/counter-api.txt doc/config-format.txt \
+                               doc/clock-api.txt doc/session-api.txt \
+                               doc/session-overview.txt doc/backtrace.txt \
                                doc/advanced-configuration.txt
 
 
@@ -222,20 +240,12 @@ pkgconfig_DATA = connman.pc
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --disable-datafiles \
-                               --enable-loopback \
-                               --enable-ethernet \
-                               --enable-wifi \
-                               --enable-bluetooth \
-                               --enable-ofono \
-                               --enable-pacrunner \
-                               --enable-google \
-                               --enable-meego \
-                               --enable-client \
-                               --enable-portal \
                                --enable-hh2serial-gps \
-                               --enable-ntpd \
                                --enable-openconnect \
-                               --enable-tools
+                               --enable-openvpn \
+                               --enable-vpnc \
+                               --enable-nmcompat \
+                               --enable-polkit
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 
@@ -244,8 +254,6 @@ MAINTAINERCLEANFILES = Makefile.in \
        ltmain.sh depcomp compile missing install-sh mkinstalldirs
 
 
-src/plugin.$(OBJEXT): src/builtin.h
-
 src/builtin.h: src/genbuiltin $(builtin_sources)
        $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
 
@@ -260,9 +268,9 @@ 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
Domain: Network & Connectivity / Data Network;