X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=14d6ca1779d00ca4bbc9a9be2fca42c796953c8c;hb=664e356ee119cc6a7650610518fa341d1a1f5ca5;hp=5511c3f3b59d7bd7a554ee9a03c18acb62a08008;hpb=26cc90dfaf2ad149b702626f9552c81abbb26862;p=platform%2Fupstream%2Fconnman.git diff --git a/Makefile.am b/Makefile.am index 5511c3f..14d6ca1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,7 +59,6 @@ stats_sources = src/nostats.c endif shared_sources = src/shared/util.h src/shared/util.c \ - src/shared/netlink.h src/shared/netlink.c \ src/shared/arp.h src/shared/arp.c if DATAFILES @@ -159,7 +158,7 @@ src_connmand_SOURCES += src/mesh.c src/mesh-netlink.c endif src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ - @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \ + @DLOG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \ -lresolv -ldl -lrt if TIZEN_EXT_WIFI_MESH @@ -172,7 +171,7 @@ src_connmand_LDFLAGS = -Wl,--export-dynamic -pie \ src_connmand_wait_online_SOURCES = src/connmand-wait-online.c src_connmand_wait_online_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ + @DLOG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ if XTABLES src_connmand_SOURCES += src/iptables.c src/firewall-iptables.c @@ -181,7 +180,7 @@ endif if NFTABLES src_connmand_SOURCES += src/firewall-nftables.c -src_connmand_LDADD += @NFTABLES_LIBS@ +src_connmand_LDADD += @NFTABLES_LIBS@ @LIBMNL_LIBS@ endif if VPN @@ -222,14 +221,14 @@ vpn_connman_vpnd_SOURCES = $(gdhcp_sources) $(builtin_vpn_sources) \ 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 src/acd.c + vpn/vpn-config.c vpn/vpn-settings.c src/acd.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@ @GNUTLS_LIBS@ \ + @DLOG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \ @LIBSYSTEMD_LIBS@ @XTABLES_LIBS@ \ -lresolv -ldl @@ -284,7 +283,7 @@ build_vpn_plugindir = $(vpn_plugindir) endif endif -AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LIBSYSTEMD_CFLAGS@\ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LIBSYSTEMD_CFLAGS@ @DLOG_CFLAGS@ \ @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ @@ -302,7 +301,7 @@ else AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus endif -src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \ +src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @DLOG_CFLAGS@ \ @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ @@ -318,7 +317,7 @@ EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf \ $(service_files_sources) scripts/connman.in if VPN -vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ +vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @DLOG_CFLAGS@ \ $(builtin_vpn_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ @@ -337,8 +336,8 @@ src_connmand_CFLAGS += @XTABLES_CFLAGS@ endif if NFTABLES -AM_CFLAGS += @NFTABLES_CFLAGS@ -src_connmand_CFLAGS += @NFTABLES_CFLAGS@ +AM_CFLAGS += @NFTABLES_CFLAGS@ @LIBMNL_CFLAGS@ +src_connmand_CFLAGS += @NFTABLES_CFLAGS@ @LIBMNL_CFLAGS@ endif if TIZEN_EXT_WIFI_MESH @@ -374,7 +373,11 @@ 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@ \ +if TIZEN_EXT_INS +client_connmanctl_SOURCES += client/ins.c client/ins.h +endif + +client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ @DLOG_LIBS@ \ -lreadline -ldl -lncurses endif @@ -383,7 +386,7 @@ noinst_PROGRAMS += unit/test-ippool unit_test_ippool_SOURCES = $(backtrace_sources) src/log.c src/dbus.c \ src/error.c src/ippool.c unit/test-ippool.c unit_test_ippool_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ -ldl + @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ -ldl TESTS = unit/test-ippool @@ -402,13 +405,13 @@ noinst_PROGRAMS += tools/supplicant-test \ tools/tap-test tools/wpad-test \ tools/stats-tool tools/private-network-test \ tools/session-test \ - tools/dnsproxy-test tools/netlink-test + tools/dnsproxy-test tools_supplicant_test_SOURCES = tools/supplicant-test.c \ tools/supplicant-dbus.h tools/supplicant-dbus.c \ tools/supplicant.h tools/supplicant.c tools_supplicant_test_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ + @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv @@ -430,17 +433,17 @@ tools_dhcp_server_test_SOURCES = $(backtrace_sources) src/log.c src/util.c \ tools_dhcp_server_test_LDADD = @GLIB_LIBS@ -ldl tools_dbus_test_SOURCES = tools/dbus-test.c -tools_dbus_test_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ +tools_dbus_test_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ -tools_polkit_test_LDADD = @DBUS_LIBS@ +tools_polkit_test_LDADD = @DBUS_LIBS@ @DLOG_LIBS@ -tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ +tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ tools_session_test_SOURCES = $(backtrace_sources) src/log.c src/dbus.c src/error.c \ tools/session-test.c tools/session-utils.c tools/manager-api.c \ tools/session-api.c tools/session-test.h tools_session_test_LDADD = gdbus/libgdbus-internal.la \ - @GLIB_LIBS@ @DBUS_LIBS@ -ldl + @GLIB_LIBS@ @DBUS_LIBS@ @DLOG_LIBS@ -ldl if XTABLES noinst_PROGRAMS += tools/iptables-test tools/ip6tables-test tools/iptables-unit \ @@ -454,14 +457,14 @@ tools_ip6tables_test_SOURCES = $(backtrace_sources) src/log.c src/iptables.c \ tools/ip6tables-test.c tools_ip6tables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ -ldl -tools_iptables_unit_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ +tools_iptables_unit_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @DLOG_CFLAGS@ \ -DIPTABLES_SAVE=\""${IPTABLES_SAVE}"\" \ -DIP6TABLES_SAVE=\""${IP6TABLES_SAVE}"\" tools_iptables_unit_SOURCES = $(backtrace_sources) src/log.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 + @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @DLOG_LIBS@ -ldl TESTS += unit/test-iptables @@ -475,10 +478,6 @@ endif tools_dnsproxy_test_SOURCES = tools/dnsproxy-test.c tools_dnsproxy_test_LDADD = @GLIB_LIBS@ -tools_netlink_test_SOURCES = src/shared/util.c src/shared/netlink.c \ - tools/netlink-test.c -tools_netlink_test_LDADD = @GLIB_LIBS@ - endif test_scripts = test/get-state test/list-services \