Simplify linker script

Version linker scripts support function names and globs, so there's no
need to rely on nm tool to gather the exported symbols.
This commit is contained in:
Lucas De Marchi 2010-09-21 15:46:56 -03:00 committed by Johan Hedberg
parent ce86aba22d
commit 534be7a9c3
4 changed files with 12 additions and 15 deletions

1
.gitignore vendored
View File

@ -34,7 +34,6 @@ bluez.pc
lib/bluetooth
src/builtin.h
src/bluetoothd
src/bluetooth.exp
src/bluetooth.ver
audio/telephony.c
scripts/bluetooth.rules

View File

@ -258,7 +258,7 @@ builtin_files = src/builtin.h $(builtin_nodist)
nodist_src_bluetoothd_SOURCES = $(builtin_files)
CLEANFILES += src/bluetooth.ver src/bluetooth.exp $(builtin_files)
CLEANFILES += $(builtin_files)
man_MANS = src/bluetoothd.8
@ -392,18 +392,6 @@ src/plugin.$(OBJEXT): src/builtin.h
src/builtin.h: src/genbuiltin $(builtin_sources)
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
src/bluetooth.exp: $(src_bluetoothd_OBJECTS)
$(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \
$(EGREP) -e '^btd_' -e '^g_dbus_' > $@
$(AM_V_at)echo -e "info" >> $@
$(AM_V_at)echo -e "error" >> $@
$(AM_V_at)echo -e "debug" >> $@
src/bluetooth.ver: src/bluetooth.exp
$(AM_V_at)echo "{ global:" > $@
$(AM_V_GEN)$(SED) -e "s/\(.*\)/\1;/" $< >> $@
$(AM_V_at)echo "local: *; };" >> $@
audio/telephony.c: audio/@TELEPHONY_DRIVER@
$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@

View File

@ -65,5 +65,5 @@ if (test "${enable_netlink}" = "yes"); then
fi
AM_CONDITIONAL(NETLINK, test "${enable_netlink}" = "yes")
AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml src/bluetooth.ver
src/bluetoothd.8 bluez.pc)

10
src/bluetooth.ver.in Normal file
View File

@ -0,0 +1,10 @@
{
global:
btd_*;
g_dbus_*;
info;
error;
debug;
local:
*;
};