X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=94c6e9d3f67e2b316122d867bf706eb18ebd2cd2;hb=d04bfa0350781ebfb8cbb2e64fabdfb2f36cd302;hp=5be7625f530639ca0e43ee28b5a8afff1c56619e;hpb=0f207feed5b323a80a91911424bf18bdbe2c03a8;p=platform%2Fupstream%2Fconnman.git diff --git a/Makefile.am b/Makefile.am old mode 100755 new mode 100644 index 5be7625..94c6e9d --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,10 @@ include_HEADERS = include/log.h include/plugin.h \ include/session.h include/ipaddress.h include/agent.h \ include/inotify.h include/peer.h include/machine.h +if TIZEN_EXT_WIFI_MESH +include_HEADERS += include/mesh.h include/mesh-netlink.h +endif + nodist_include_HEADERS = include/version.h noinst_HEADERS = include/rtnl.h include/task.h \ @@ -59,20 +63,31 @@ if VPN dbusconf_DATA += vpn/connman-vpn-dbus.conf dbusservicedir = @DBUS_DATADIR@ dbusservice_DATA = vpn/net.connman.vpn.service -endif if SYSTEMD systemdunitdir = @SYSTEMD_UNITDIR@ systemdunit_DATA = src/connman.service vpn/connman-vpn.service endif -endif service_files_sources = src/connman.service.in src/net.connman.service.in \ vpn/net.connman.vpn.service.in vpn/connman-vpn.service.in service_files = src/connman.service src/net.connman.service \ vpn/net.connman.vpn.service vpn/connman-vpn.service +else + +if SYSTEMD +systemdunitdir = @SYSTEMD_UNITDIR@ +systemdunit_DATA = src/connman.service + +endif + +service_files_sources = src/connman.service.in src/net.connman.service.in +service_files = src/connman.service src/net.connman.service +endif +endif + plugin_LTLIBRARIES = plugin_objects = @@ -83,13 +98,21 @@ builtin_libadd = builtin_cflags = noinst_PROGRAMS = +if TIZEN_EXT +bin_PROGRAMS = src/connmand +else bin_PROGRAMS = +endif unit_objects = MANUAL_PAGES = -sbin_PROGRAMS = src/connmand +if TIZEN_EXT +sbin_PROGRAMS = +else +sbin_PROGRAMS = src/connmand src/connmand-wait-online +endif src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \ $(builtin_sources) $(shared_sources) src/connman.ver \ @@ -105,19 +128,41 @@ src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \ 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/stats.c src/dnsproxy.c src/6to4.c \ src/ippool.c src/bridge.c src/nat.c src/ipaddress.c \ - src/inotify.c src/firewall.c src/ipv6pd.c src/peer.c \ + src/inotify.c src/ipv6pd.c src/peer.c \ src/peer_service.c src/machine.c src/util.c +if TIZEN_EXT_WIFI_MESH +src_connmand_SOURCES += src/mesh.c src/mesh-netlink.c +endif + src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ - @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @GNUTLS_LIBS@ \ - @TPKP_GNUTLS_LIBS@ \ + @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \ -lresolv -ldl -lrt -src_connmand_LDFLAGS = -Wl,--export-dynamic \ +if TIZEN_EXT_WIFI_MESH +src_connmand_LDADD += -lnl -lnl-genl +endif + +src_connmand_LDFLAGS = -Wl,--export-dynamic -pie \ -Wl,--version-script=$(srcdir)/src/connman.ver +src_connmand_wait_online_SOURCES = src/connmand-wait-online.c + +src_connmand_wait_online_LDADD = gdbus/libgdbus-internal.la \ + @GLIB_LIBS@ @DBUS_LIBS@ + +if XTABLES +src_connmand_SOURCES += src/iptables.c src/firewall-iptables.c +src_connmand_LDADD += @XTABLES_LIBS@ +endif + +if NFTABLES +src_connmand_SOURCES += src/firewall-nftables.c +src_connmand_LDADD += @NFTABLES_LIBS@ +endif + if VPN vpn_plugin_LTLIBRARIES = @@ -128,7 +173,11 @@ builtin_vpn_sources = builtin_vpn_libadd = builtin_vpn_cflags = +if TIZEN_EXT +bin_PROGRAMS += vpn/connman-vpnd +else sbin_PROGRAMS += vpn/connman-vpnd +endif vpn_connman_vpnd_SOURCES = $(gdhcp_sources) $(builtin_vpn_sources) \ $(gweb_sources) vpn/vpn.ver vpn/main.c vpn/vpn.h \ @@ -148,16 +197,24 @@ vpn_connman_vpnd_SOURCES = $(gdhcp_sources) $(builtin_vpn_sources) \ 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/ippool.c src/bridge.c src/nat.c src/ipaddress.c \ - src/inotify.c src/firewall.c src/ipv6pd.c src/peer.c \ + src/inotify.c src/firewall-iptables.c src/ipv6pd.c src/peer.c \ src/peer_service.c src/machine.c src/util.c \ vpn/vpn-agent.c vpn/vpn-agent.h \ vpn/vpn-config.c +if TIZEN_EXT_WIFI_MESH +vpn_connman_vpnd_SOURCES += src/mesh.c src/mesh-netlink.c +endif + vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \ @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @GNUTLS_LIBS@ \ - @TPKP_GNUTLS_LIBS@ \ + @LIBSYSTEMD_LIBS@ \ -lresolv -ldl +if TIZEN_EXT_WIFI_MESH +vpn_connman_vpnd_LDADD += -lnl -lnl-genl +endif + vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/vpn/vpn.ver endif @@ -170,8 +227,8 @@ endif CLEANFILES = src/connman.conf $(BUILT_SOURCES) $(service_files) -statedir = $(localstatedir)/run/connman -vpn_statedir = $(localstatedir)/run/connman-vpn +statedir = $(runstatedir)/connman +vpn_statedir = $(runstatedir)/connman-vpn if VPN vpn_plugindir = $(libdir)/connman/plugins-vpn @@ -200,8 +257,8 @@ build_vpn_plugindir = $(vpn_plugindir) endif endif -AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ - @GNUTLS_CFLAGS@ @TPKP_GNUTLS_CFLAGS@ $(builtin_cflags) \ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LIBSYSTEMD_CFLAGS@\ + @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ @@ -209,16 +266,17 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ -DSCRIPTDIR=\""$(build_scriptdir)"\" \ -DSTORAGEDIR=\""$(storagedir)\"" \ -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \ - -DCONFIGDIR=\""$(configdir)\"" + -DCONFIGDIR=\""$(configdir)\"" \ + -fPIE if VPN -AM_CPPFLAGS = @TPKP_GNUTLS_CFLAGS@ -I$(builddir)/include -I$(srcdir)/gdbus +AM_CPPFLAGS = -I$(builddir)/include -I$(srcdir)/gdbus else -AM_CPPFLAGS = @TPKP_GNUTLS_CFLAGS@ -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus +AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus endif -src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ - @GNUTLS_CFLAGS@ @TPKP_GNUTLS_CFLAGS@ $(builtin_cflags) \ +src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \ + @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ -DPLUGINDIR=\""$(build_plugindir)"\" \ @@ -246,6 +304,16 @@ vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ endif +if XTABLES +AM_CFLAGS += @XTABLES_CFLAGS@ +src_connmand_CFLAGS += @XTABLES_CFLAGS@ +endif + +if NFTABLES +AM_CFLAGS += @NFTABLES_CFLAGS@ +src_connmand_CFLAGS += @NFTABLES_CFLAGS@ +endif + EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf script_DATA = @@ -257,8 +325,6 @@ include Makefile.plugins if CLIENT bin_PROGRAMS += client/connmanctl -MANUAL_PAGES = doc/connmanctl.1 - client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.c \ client/services.h client/services.c \ client/commands.h client/commands.c \ @@ -268,6 +334,10 @@ client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.c \ client/vpnconnections.h client/vpnconnections.c \ client/main.c +if TIZEN_EXT_WIFI_MESH +client_connmanctl_SOURCES += client/mesh.c client/mesh.h +endif + client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ \ -lreadline -ldl -lncurses endif @@ -285,7 +355,7 @@ if WISPR noinst_PROGRAMS += tools/wispr tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c -tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ @TPKP_GNUTLS_LIBS@ -lresolv +tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv endif if TOOLS @@ -293,9 +363,9 @@ 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/tap-test tools/wpad-test \ tools/stats-tool tools/private-network-test \ - tools/session-test tools/iptables-unit \ + tools/session-test \ tools/dnsproxy-test tools/netlink-test tools_supplicant_test_SOURCES = tools/supplicant-test.c \ @@ -305,7 +375,7 @@ tools_supplicant_test_LDADD = gdbus/libgdbus-internal.la \ @GLIB_LIBS@ @DBUS_LIBS@ tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c -tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ @TPKP_GNUTLS_LIBS@ -lresolv +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 @@ -326,9 +396,6 @@ tools_dbus_test_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ tools_polkit_test_LDADD = @DBUS_LIBS@ -tools_iptables_test_SOURCES = src/log.c src/iptables.c tools/iptables-test.c -tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ -ldl - tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ tools_session_test_SOURCES = src/log.c src/dbus.c src/error.c \ @@ -337,17 +404,26 @@ tools_session_test_SOURCES = src/log.c src/dbus.c src/error.c \ tools_session_test_LDADD = gdbus/libgdbus-internal.la \ @GLIB_LIBS@ @DBUS_LIBS@ -ldl +if XTABLES +noinst_PROGRAMS += tools/iptables-test tools/iptables-unit + +tools_iptables_test_SOURCES = $(backtrace_sources) src/log.c src/iptables.c \ + tools/iptables-test.c +tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ -ldl + tools_iptables_unit_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ -DIPTABLES_SAVE=\""${IPTABLES_SAVE}"\" tools_iptables_unit_SOURCES = src/log.c \ - src/iptables.c src/firewall.c src/nat.c tools/iptables-unit.c + src/iptables.c src/firewall-iptables.c src/nat.c \ + tools/iptables-unit.c tools_iptables_unit_LDADD = gdbus/libgdbus-internal.la \ @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl +endif tools_dnsproxy_test_SOURCES = tools/dnsproxy-test.c tools_dnsproxy_test_LDADD = @GLIB_LIBS@ -tools_netlink_test_SOURCES =$(shared_sources) tools/netlink-test.c +tools_netlink_test_SOURCES = $(shared_sources) tools/netlink-test.c tools_netlink_test_LDADD = @GLIB_LIBS@ endif @@ -389,14 +465,22 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \ doc/vpn-config-format.txt \ doc/vpn-connection-api.txt \ doc/vpn-manager-api.txt doc/vpn-overview.txt \ - doc/session-policy-format.txt + doc/session-policy-format.txt \ + doc/connmanctl.1.in doc/connman.conf.5.in \ + doc/connman-service.config.5.in \ + doc/connman-vpn.conf.5.in \ + doc/connman-vpn-provider.config.5.in \ + doc/connman.8.in doc/connman-vpn.8.in EXTRA_DIST += src/main.conf \ src/eduroam.config -MANUAL_PAGES += doc/connman.8 doc/connman.conf.5 +#MANUAL_PAGES += doc/connmanctl.1 doc/connman.conf.5 \ +# doc/connman-service.config.5 doc/connman-vpn.conf.5 \ +# doc/connman-vpn-provider.config.5 \ +# doc/connman.8 doc/connman-vpn.8 -dist_man_MANS = $(MANUAL_PAGES) +nodist_man_MANS = $(MANUAL_PAGES) pkgconfigdir = $(libdir)/pkgconfig @@ -406,6 +490,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles \ --enable-hh2serial-gps \ --enable-openconnect \ --enable-openvpn \ + --enable-ipsec \ --enable-vpnc \ --enable-session-policy-local \ --enable-nmcompat \ @@ -419,9 +504,11 @@ MAINTAINERCLEANFILES = Makefile.in \ src/builtin.h: src/genbuiltin $(builtin_sources) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ vpn/builtin.h: src/genbuiltin $(builtin_vpn_sources) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_vpn_modules) > $@ src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf @@ -438,6 +525,7 @@ if POLKIT else $(AM_V_GEN)cp $(srcdir)/vpn/vpn-dbus.conf $@ endif +CLEANFILES += vpn/connman-vpn-dbus.conf endif if SELINUX @@ -455,12 +543,29 @@ EXTRA_DIST += vpn/connman-task.te do_subst = $(AM_V_GEN)$(SED) \ -e 's,[@]prefix[@],$(prefix),g' \ -e 's,[@]sbindir[@],$(sbindir),g' \ - -e 's,[@]sysconfdir[@],$(sysconfdir),g' + -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ + -e 's,[@]storagedir[@],$(storagedir),g' \ + -e 's,[@]vpn_storagedir[@],$(vpn_storagedir),g' \ + -e 's,[@]localstatedir[@],$(localstatedir),g' + +%.1 : %.1.in + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ + +%.5 : %.5.in + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ + +%.8 : %.8.in + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(do_subst) < $< > $@ %.service: %.service.in Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) $(do_subst) < $< > $@ scripts/connman: scripts/connman.in Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) $(do_subst) < $< > $@ include/connman/version.h: include/version.h @@ -472,4 +577,4 @@ include/connman/%.h: $(abs_top_srcdir)/include/%.h $(AM_V_GEN)$(LN_S) $< $@ clean-local: - @$(RM) -rf include/connman + @$(RM) -rf include/connman $(MANUAL_PAGES)