Hi Lucas,
> Version linker scripts support function names and globs, so there's no
> need to rely on nm tool to gather the exported symbols.
> ---
> .gitignore | 2 --
> Makefile.am | 12 +-----------
> configure.ac | 1 -
> src/connman.ver | 8 ++++++++
> 4 files changed, 9 insertions(+), 14 deletions(-)
> create mode 100644 src/connman.ver
>
> diff --git a/.gitignore b/.gitignore
> index fb4f50b..5a173f7 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -29,8 +29,6 @@ include/connman
> include/version.h
> src/builtin.h
> src/connmand
> -src/connman.exp
> -src/connman.ver
> src/connman.conf
> src/connman.service
> src/*-connman.rules
> diff --git a/Makefile.am b/Makefile.am
> index f5158ed..1c52e25 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -86,8 +86,7 @@ src_connmand_LDFLAGS = -Wl,--export-dynamic
> -Wl,--version-script=src/connman.ver
>
> src_connmand_DEPENDENCIES = 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
>
> @@ -241,15 +240,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 $@
> diff --git a/configure.ac b/configure.ac
> index b2dcc80..ab06b8e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -32,7 +32,6 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
>
> AC_DISABLE_STATIC
> AC_PROG_LIBTOOL
> -AC_PROG_NM
you also can remove the check for AWK and SED then.
> AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
> [disable code optimization through compiler]), [
> diff --git a/src/connman.ver b/src/connman.ver
> new file mode 100644
> index 0000000..9a178a2
> --- /dev/null
> +++ b/src/connman.ver
> @@ -0,0 +1,8 @@
> +{
> + global:
> + connman_*;
> + g_dbus_*;
> + g_dhcp_*;
> + local:
> + *;
> +};
Also I need patches for oFono, BlueZ and obexd that do the same.
Regards
Marcel
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
