diff options
author | Balint Reczey <balint.reczey@ericsson.com> | 2010-12-07 13:38:15 +0000 |
---|---|---|
committer | Balint Reczey <balint.reczey@ericsson.com> | 2010-12-07 13:38:15 +0000 |
commit | 8b4573f70515e6f03a700c0097582c17a987cea8 (patch) | |
tree | b4713a77e65d554d3a2ef994f32fa9e96ba5c905 | |
parent | bd8c1e7a3a9ec12426a3db25dcfe108ce9208ad9 (diff) |
Make libtool export only symbols listed in *.def files
svn path=/trunk/; revision=35145
-rw-r--r-- | Makefile.am.inc | 3 | ||||
-rw-r--r-- | epan/Makefile.am | 6 | ||||
-rw-r--r-- | wiretap/Makefile.am | 5 | ||||
-rw-r--r-- | wsutil/Makefile.am | 8 |
4 files changed, 17 insertions, 5 deletions
diff --git a/Makefile.am.inc b/Makefile.am.inc index 3c77dba0d8..7af01b3161 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -23,3 +23,6 @@ .l.c: $(RUNLEX) "$(LEX)" -o$@ $< + +.def.sym: + $(AWK) '/^EXPORTS$$/ {next;}; /^[^;]/ { print $$1;}' < $< > $@ diff --git a/epan/Makefile.am b/epan/Makefile.am index 5ad26e8a56..738aa0f896 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -54,7 +54,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags` noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la -libwireshark_la_LDFLAGS = -version-info 0:1:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 0:1:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ include Makefile.common @@ -113,6 +113,7 @@ CLEANFILES = \ libwireshark_generated.la \ libwireshark_asmopt.a \ libwireshark_asmopt.la \ + libwireshark.sym \ *~ DISTCLEANFILES = \ @@ -145,7 +146,8 @@ libwireshark_la_DEPENDENCIES = \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_lib) \ ${top_builddir}/wsutil/libwsutil.la \ - ${top_builddir}/wiretap/libwiretap.la + ${top_builddir}/wiretap/libwiretap.la \ + libwireshark.sym #EXTRA_PROGRAMS = reassemble_test #reassemble_test_LDADD = $(GLIB_LIBS) diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index c25827ec95..090cbb933e 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -29,7 +29,7 @@ include Makefile.common noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la -libwiretap_la_LDFLAGS = -version-info 0:1:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:1:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ if HAVE_WARNINGS_AS_ERRORS AM_NON_GENERATED_CFLAGS = -Werror @@ -42,6 +42,7 @@ CLEANFILES = \ libwiretap.la \ libwiretap_generated.a \ libwiretap_generated.la \ + wtap.sym \ *~ MAINTAINERCLEANFILES = \ @@ -69,6 +70,8 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) +libwiretap_la_DEPENDENCIES = wtap.sym + libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) RUNLEX = $(top_srcdir)/tools/runlex.sh diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 9b00cee8d4..e17c488e34 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -22,6 +22,8 @@ ACLOCAL_AMFLAGS = `../aclocal-flags` +include ../Makefile.am.inc + include Makefile.common if HAVE_WARNINGS_AS_ERRORS @@ -40,7 +42,7 @@ wsutil_optional_objects = \ @STRPTIME_LO@ lib_LTLIBRARIES = libwsutil.la -libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ +libwsutil_la_LDFLAGS = -version-info 0:0:0 -export-symbols libwsutil.sym @LDFLAGS_SHAREDLIB@ INCLUDES = -I$(srcdir)/.. @@ -63,7 +65,8 @@ EXTRA_libwsutil_la_SOURCES= \ wsgetopt.h libwsutil_la_DEPENDENCIES= \ - $(wsutil_optional_objects) + $(wsutil_optional_objects) \ + libwsutil.sym libwsutil_la_LIBADD = \ @GLIB_LIBS@ \ @@ -81,6 +84,7 @@ EXTRA_DIST = \ CLEANFILES = \ libwsutil.a \ libwsutil.la \ + libwsutil.sym \ *~ MAINTAINERCLEANFILES = \ |