projects / platform / upstream / connman.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove WPA2 and WPA3 service together
[platform/upstream/connman.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 5971ca9..9a756a4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,10 +14,14 @@ include_HEADERS = include/log.h include/plugin.h \
                        include/inotify.h include/peer.h include/machine.h \
                        include/acd.h include/tethering.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 \
-                       include/dbus.h include/option.h \
+                       include/dbus.h \
                        include/provider.h include/vpn-dbus.h \
                        include/utsname.h include/timeserver.h include/proxy.h \
                        include/technology.h include/setting.h \
@@ -38,7 +42,7 @@ backtrace_sources = src/backtrace.c
 endif
 
 gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c \
-               gdhcp/server.c gdhcp/unaligned.h
+               gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.c gdhcp/unaligned.h
 
 gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c
 
@@ -71,29 +75,32 @@ 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 src/connman-wait-online.service
-
-tmpfilesdir = @SYSTEMD_TMPFILESDIR@
-nodist_tmpfiles_DATA = scripts/connman_resolvconf.conf
+systemdunit_DATA = src/connman.service vpn/connman-vpn.service
 
-if VPN
-systemdunit_DATA += vpn/connman-vpn.service
-endif
-endif
 endif
 
 service_files_sources = src/connman.service.in src/net.connman.service.in \
                                vpn/connman-vpn.service.in \
-                               vpn/net.connman.vpn.service.in \
-                               src/connman-wait-online.service.in
+                               vpn/net.connman.vpn.service.in
 service_files = src/connman.service src/net.connman.service \
                                vpn/connman-vpn.service \
-                               vpn/net.connman.vpn.service \
-                               src/connman-wait-online.service
+                               vpn/net.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 =
 
@@ -105,13 +112,21 @@ builtin_libadd =
 builtin_cflags =
 
 noinst_PROGRAMS =
+if TIZEN_EXT
+bin_PROGRAMS = src/connmand
+else
 bin_PROGRAMS =
+endif
 
 unit_objects =
 
 MANUAL_PAGES =
 
+if TIZEN_EXT
+sbin_PROGRAMS =
+else
 sbin_PROGRAMS = src/connmand src/connmand-wait-online
+endif
 
 src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) $(stats_sources) \
                        $(backtrace_sources) $(builtin_sources) $(shared_sources) \
@@ -138,18 +153,25 @@ endif
 if SYSTEMD_RESOLVED_DNS_BACKEND
 src_connmand_SOURCES += src/dns-systemd-resolved.c
 endif
+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@ @GNUTLS_LIBS@ \
+                       @DLOG_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 += @LIBNL_LIBS@ @LIBNL_GENL_LIBS@
+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@
+                       @DLOG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@
 
 if XTABLES
 src_connmand_SOURCES += src/iptables.c src/firewall-iptables.c
@@ -171,22 +193,49 @@ 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 = $(builtin_vpn_sources) $(backtrace_sources) \
+vpn_connman_vpnd_SOURCES = $(gdhcp_sources) $(builtin_vpn_sources) \
+                       $(shared_sources) \
                        $(gweb_sources) vpn/vpn.ver vpn/main.c vpn/vpn.h \
-                       src/log.c src/error.c src/plugin.c src/task.c \
                        vpn/vpn-manager.c vpn/vpn-provider.c \
                        vpn/vpn-provider.h vpn/vpn-rtnl.h \
                        vpn/vpn-ipconfig.c src/inet.c vpn/vpn-rtnl.c \
-                       src/dbus.c src/storage.c src/ipaddress.c src/agent.c \
-                       vpn/vpn-agent.c vpn/vpn-agent.h src/inotify.c \
-                       vpn/vpn-config.c vpn/vpn-settings.c
+                       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/service.c \
+                       src/clock.c src/timezone.c src/agent-connman.c \
+                       src/agent.c src/notifier.c src/provider.c \
+                       src/resolver.c src/ipconfig.c src/detect.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/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/ippool.c src/bridge.c src/nat.c src/ipaddress.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-util.c vpn/vpn-agent.h \
+                       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
 
+if TIZEN_EXT_WIFI_MESH
+vpn_connman_vpnd_LDADD += @LIBNL_LIBS@ @LIBNL_GENL_LIBS@
+endif
+
 vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \
                                -Wl,--version-script=$(srcdir)/vpn/vpn.ver
 endif
@@ -234,7 +283,7 @@ build_vpn_plugindir = $(vpn_plugindir)
 endif
 endif
 
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LIBSYSTEMD_CFLAGS@ @DLOG_CFLAGS@ \
                                @GNUTLS_CFLAGS@ $(builtin_cflags) \
                                -DCONNMAN_PLUGIN_BUILTIN \
                                -DSTATEDIR=\""$(statedir)"\" \
@@ -243,7 +292,8 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\"" \
                                -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \
-                               -DCONFIGDIR=\""$(configdir)\""
+                               -DCONFIGDIR=\""$(configdir)\"" \
+                               -fPIE
 
 if VPN
 AM_CPPFLAGS = -I$(builddir)/include -I$(srcdir)/gdbus
@@ -251,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)"\" \
@@ -267,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@ \
+vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @DLOG_CFLAGS@ \
                                $(builtin_vpn_cflags) \
                                -DCONNMAN_PLUGIN_BUILTIN \
                                -DVPN_STATEDIR=\""$(vpn_statedir)"\" \
@@ -290,6 +340,14 @@ AM_CFLAGS += @NFTABLES_CFLAGS@ @LIBMNL_CFLAGS@
 src_connmand_CFLAGS += @NFTABLES_CFLAGS@ @LIBMNL_CFLAGS@
 endif
 
+if TIZEN_EXT_WIFI_MESH
+AM_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@
+src_connmand_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@
+if VPN
+vpn_connman_vpnd_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@
+endif
+endif
+
 EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf
 
 script_DATA =
@@ -311,8 +369,14 @@ client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.c \
                        client/vpnconnections.h client/vpnconnections.c \
                        client/main.c
 
-client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ \
-                               -lreadline -ldl
+if TIZEN_EXT_WIFI_MESH
+client_connmanctl_SOURCES += client/mesh.c client/mesh.h
+endif
+
+client_connmanctl_SOURCES += client/ins.c client/ins.h
+
+client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ @DLOG_LIBS@ \
+                               -lreadline -ldl -lncurses
 endif
 
 noinst_PROGRAMS += unit/test-ippool
@@ -320,7 +384,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
 
@@ -345,7 +409,7 @@ 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
@@ -367,17 +431,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 \
@@ -391,14 +455,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
 
@@ -459,13 +523,12 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
                                doc/connman.8.in doc/connman-vpn.8.in
 
 EXTRA_DIST += src/main.conf \
-               src/eduroam.config \
-               scripts/connman_resolvconf.conf.in
+               src/eduroam.config
 
-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
+#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
 
 nodist_man_MANS = $(MANUAL_PAGES)
 
@@ -477,6 +540,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles \
                                --enable-hh2serial-gps \
                                --enable-openconnect \
                                --enable-openvpn \
+                               --enable-ipsec \
                                --enable-vpnc \
                                --enable-session-policy-local \
                                --enable-nmcompat \
@@ -567,5 +631,10 @@ include/connman/%.h: $(abs_top_srcdir)/include/%.h
        $(AM_V_at)$(MKDIR_P) include/connman
        $(AM_V_GEN)$(LN_S) $< $@
 
+isudir = /etc/isu/connman
+isu_DATA = isu/isu.cfg
+isusystemservicedir = /etc/isu/connman/system-services/
+isusystemservice_DATA = isu/system-services/connman.service
+
 clean-local:
        @$(RM) -rf include/connman $(MANUAL_PAGES)
Domain: Network & Connectivity / Data Network;