X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=145ccb665d0bfbdeaf69063822324fbb83248b88;hb=fdf8bd453137e4d575e1ea39745d6aa7311cefed;hp=9b466445272416cfc95c6b1cfa0c6cca73485aea;hpb=1fd3f334bf70e38c1d0481028b51bab02e2cec59;p=framework%2Fconnectivity%2Fconnman.git diff --git a/Makefile.am b/Makefile.am index 9b46644..145ccb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,35 +4,47 @@ AM_MAKEFLAGS = --no-print-directory includedir = @includedir@/connman include_HEADERS = include/types.h include/log.h include/plugin.h \ - include/security.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/utsname.h include/timeserver.h \ - include/location.h include/technology.h + include/provider.h \ + include/utsname.h include/timeserver.h include/proxy.h \ + include/technology.h include/setting.h local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \ $(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 +gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c \ + gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.c -gresolv_sources = gresolv/gresolv.h gresolv/gresolv.c +gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c \ + gweb/giognutls.h gweb/giognutls.c if DATAFILES -dbusdir = @DBUS_DATADIR@ -dbus_DATA = src/connman.conf +if NMCOMPAT +nmcompat_conf = plugins/connman-nmcompat.conf +endif + +dbusconfdir = @DBUS_CONFDIR@ + +dbusconf_DATA = src/connman.conf $(nmcompat_conf) + +if SYSTEMD +systemdunitdir = @SYSTEMD_UNITDIR@ + +systemdunit_DATA = src/connman.service +endif endif plugin_LTLIBRARIES = @@ -46,38 +58,38 @@ builtin_cflags = noinst_PROGRAMS = +unit_objects = + sbin_PROGRAMS = src/connmand src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \ - $(gresolv_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 \ + gweb/gweb.h gweb/gweb.c \ + gweb/gresolv.h gweb/gresolv.c \ + 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/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/security.c src/resolver.c src/ipconfig.c \ - src/ipv4.c src/dhcp.c src/rtnl.c src/inet.c \ + src/resolver.c src/ipconfig.c src/detect.c src/inet.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 - -if UDEV -src_connmand_SOURCES += src/udev.c -else -src_connmand_SOURCES += src/udev-compat.c -endif + 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@ @UDEV_LIBS@ -lresolv -ldl + @CAPNG_LIBS@ @XTABLES_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 +BUILT_SOURCES = $(local_headers) -CLEANFILES = src/connman.ver src/connman.exp src/connman.conf \ - src/builtin.h $(local_headers) +CLEANFILES = src/connman.conf src/builtin.h $(BUILT_SOURCES) statedir = $(localstatedir)/run/connman @@ -87,6 +99,8 @@ scriptdir = $(libdir)/connman/scripts storagedir = $(localstatedir)/lib/connman +configdir = ${sysconfdir}/connman + if MAINTAINER_MODE build_plugindir = $(abs_top_srcdir)/plugins/.libs build_scriptdir = $(abs_top_srcdir)/scripts @@ -95,17 +109,19 @@ build_plugindir = $(plugindir) build_scriptdir = $(scriptdir) endif -AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \ - @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_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 = @@ -122,59 +138,70 @@ client_cm_LDADD = @DBUS_LIBS@ endif if TOOLS -noinst_PROGRAMS += tools/wifi-scan tools/supplicant-test tools/dhcp-test \ - tools/addr-test tools/tap-test tools/resolv-test \ - tools/dbus-test tools/polkit-test tools/portal-test \ - tools/iptables-test tools/wpad-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/private-network-test \ + tools/alg-test unit/test-session -tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@ +tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c +tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv 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_resolv_test_SOURCES = $(gresolv_sources) tools/resolv-test.c +tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c +tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv + +tools_resolv_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/resolv-test.c tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv -tools_wpad_test_SOURCES = $(gresolv_sources) tools/wpad-test.c +tools_wpad_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/wpad-test.c tools_wpad_test_LDADD = @GLIB_LIBS@ -lresolv +tools_stats_tool_LDADD = @GLIB_LIBS@ + tools_dhcp_test_SOURCES = $(gdhcp_sources) tools/dhcp-test.c tools_dhcp_test_LDADD = @GLIB_LIBS@ +tools_dhcp_server_test_SOURCES = $(gdhcp_sources) tools/dhcp-server-test.c +tools_dhcp_server_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 +tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ -if DHCLIENT -noinst_PROGRAMS += tools/dhclient-test +tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -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_alg_test_LDADD = @GLIB_LIBS@ -tools_dhclient_test_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\" -endif +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@ -ldl +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/list-devices test/enable-device test/disable-device \ - test/start-scanning test/list-networks \ - test/set-passphrase 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/list-providers \ - test/monitor-manager test/test-counter test/set-ip-method \ + test/connect-vpn test/disconnect-vpn test/monitor-manager \ + 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/enable-tethering test/disable-tethering + 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-supplicant \ + test/test-new-supplicant test/service-move-before \ + test/set-global-timeservers test/get-global-timeservers \ + test/test-clock if TEST testdir = $(pkglibdir)/test @@ -186,12 +213,10 @@ EXTRA_DIST += $(test_scripts) 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/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 @@ -204,15 +229,13 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --enable-wifi \ --enable-bluetooth \ --enable-ofono \ - --enable-dhclient \ - --enable-dnsproxy \ + --enable-pacrunner \ --enable-google \ --enable-meego \ - --enable-udev \ --enable-client \ - --enable-portal \ --enable-hh2serial-gps \ --enable-ntpd \ + --enable-openconnect \ --enable-tools DISTCLEANFILES = $(pkgconfig_DATA) @@ -227,15 +250,6 @@ src/plugin.$(OBJEXT): src/builtin.h 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 $@ @@ -243,15 +257,13 @@ else $(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