X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=67b2c2972aba8df964f29eb25f9d5856ad7a27be;hb=1ffd50749f3ae71bd87a6355b64f09575173868a;hp=2107e316e214961411a4797c7cefe36c1ec352cc;hpb=62200f6ffc2f31cd1e6d61c93a9e2a89e5346ae9;p=framework%2Fconnectivity%2Fconnman.git diff --git a/Makefile.am b/Makefile.am index 2107e31..67b2c29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ 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/notifier.h \ include/storage.h include/service.h \ include/resolver.h include/ipconfig.h \ include/device.h include/network.h include/inet.h @@ -14,19 +14,33 @@ 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 \ 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/profile.h include/provider.h \ + include/utsname.h include/timeserver.h include/proxy.h \ + include/location.h include/technology.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/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 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 = @@ -42,32 +56,31 @@ noinst_PROGRAMS = sbin_PROGRAMS = src/connmand -src_connmand_SOURCES = $(gdbus_sources) $(builtin_sources) \ - src/main.c src/connman.h src/log.c src/selftest.c \ +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 \ + $(builtin_sources) src/connman.ver \ + src/main.c src/connman.h src/log.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/ipv4.c src/dhcp.c src/rtnl.c src/inet.c \ + src/resolver.c src/ipconfig.c src/detect.c src/inet.c \ + src/ipv4.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/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/wpad.c src/wispr.c \ + src/stats.c src/iptables.c src/dnsproxy.c -if UDEV -src_connmand_SOURCES += src/udev.c -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_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=src/connman.ver +src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \ + @CAPNG_LIBS@ @XTABLES_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 @@ -85,9 +98,9 @@ build_plugindir = $(plugindir) build_scriptdir = $(scriptdir) endif -AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \ - @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \ - @GLIB_CFLAGS@ $(builtin_cflags) \ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \ + @NETLINK_CFLAGS@ @GNUTLS_CFLAGS@ \ + $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ -DPLUGINDIR=\""$(build_plugindir)"\" \ @@ -113,22 +126,58 @@ 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/wispr tools/wifi-scan 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_wispr_SOURCES = $(gweb_sources) tools/wispr.c +tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv 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@ @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 = 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_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ 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/set-address test/test-profile \ 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/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/set-proxy \ + test/enable-tethering test/disable-tethering test/backtrace if TEST testdir = $(pkglibdir)/test @@ -141,8 +190,9 @@ 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/device-lowlevel-api.txt \ - doc/network-lowlevel-api.txt + doc/technology-api.txt doc/counter-api.txt \ + doc/advanced-configuration.txt \ + doc/config-format.txt pkgconfigdir = $(libdir)/pkgconfig @@ -155,16 +205,14 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --enable-wifi \ --enable-bluetooth \ --enable-ofono \ - --enable-udhcp \ - --enable-dhclient \ - --enable-resolvconf \ - --enable-dnsproxy \ + --enable-pacrunner \ --enable-google \ - --enable-moblin \ - --enable-hso \ - --enable-mbm \ - --enable-udev \ + --enable-meego \ --enable-client \ + --enable-portal \ + --enable-hh2serial-gps \ + --enable-ntpd \ + --enable-openconnect \ --enable-tools DISTCLEANFILES = $(pkgconfig_DATA) @@ -179,15 +227,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_' > $@ - -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 $@ @@ -205,5 +244,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