diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2013-02-28 14:09:46 +0000 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2013-02-28 14:09:46 +0000 |
| commit | 45c2884f1bbd9c06f7ba3091d968fcb6649a5f56 (patch) | |
| tree | bb66eea36a288f1ab5e33468ee9bf2989339b2aa /wsutil/Makefile.am | |
| parent | 018ba4ea6584f63aa5c4b741c2e6f6fedc609ad2 (diff) | |
| download | wireshark-45c2884f1bbd9c06f7ba3091d968fcb6649a5f56.tar.gz | |
Export libwsutil symbols using WS_DLL_PUBLIC define
This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility
svn path=/trunk/; revision=47938
Diffstat (limited to 'wsutil/Makefile.am')
| -rw-r--r-- | wsutil/Makefile.am | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 0781f96af1..1cdfd076d8 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -26,59 +26,43 @@ ACLOCAL_AMFLAGS = `../aclocal-flags` # linked into libwsutil. wsutil_optional_objects = -# filters for symbols to be omitted from libwsutil.sym -# symbols defined only on windows -def_sym_filter_symbols = /^getenv_utf8/ || /^ws_stdio/ || /^ws_init_dll_search_path/ || /^ws_load_library/ || /^ws_module_open/ || /^utf_[168]*to[168]/ || /^arg_list_utf_16to8/ || /^npf_sys_is_running/ || /^create_app_running_mutex/ - if NEED_GETOPT_LO wsutil_optional_objects += @GETOPT_LO@ -else -def_sym_filter_symbols += || /^getopt/ || /^optarg/ || /^optind/ || /^opterr/ || /^optopt/ endif if NEED_INET_ATON_LO wsutil_optional_objects += @INET_ATON_LO@ -else -def_sym_filter_symbols += || /^inet_aton/ endif if NEED_INET_NTOP_LO wsutil_optional_objects += @INET_NTOP_LO@ -else -def_sym_filter_symbols += || /^ws_inet_ntop/ endif if NEED_INET_PTON_LO wsutil_optional_objects += @INET_PTON_LO@ -else -def_sym_filter_symbols += || /^ws_inet_pton/ endif if NEED_STRNCASECMP_LO wsutil_optional_objects += @STRNCASECMP_LO@ -else -def_sym_filter_symbols += || /^strncasecmp/ endif if NEED_STRPTIME_LO wsutil_optional_objects += @STRPTIME_LO@ -else -def_sym_filter_symbols += || /^strptime/ endif -def_sym_filter_symbols += {next;}; - include ../Makefile.am.inc include Makefile.common +AM_CFLAGS =-DWS_BUILD_DLL @COMPILE_HIDE_SYMBOLS@ + if HAVE_WARNINGS_AS_ERRORS -AM_CFLAGS = -Werror +AM_CFLAGS += -Werror endif lib_LTLIBRARIES = libwsutil.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwsutil_la_LDFLAGS = -version-info 0:0:0 -export-symbols libwsutil.sym @LDFLAGS_SHAREDLIB@ +libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ INCLUDES = -I$(srcdir)/.. @@ -100,8 +84,7 @@ EXTRA_libwsutil_la_SOURCES= \ wsgetopt_int.h libwsutil_la_DEPENDENCIES= \ - $(wsutil_optional_objects) \ - libwsutil.sym + $(wsutil_optional_objects) libwsutil_la_LIBADD = \ @GLIB_LIBS@ \ @@ -112,7 +95,6 @@ EXTRA_DIST = \ Makefile.nmake \ file_util.c \ file_util.h \ - libwsutil.def \ unicode-utils.c \ unicode-utils.h \ wsgcrypt.h @@ -120,7 +102,6 @@ EXTRA_DIST = \ CLEANFILES = \ libwsutil.a \ libwsutil.la \ - libwsutil.sym \ *~ MAINTAINERCLEANFILES = \ @@ -132,7 +113,7 @@ MAINTAINERCLEANFILES = \ dumpabi-libwsutil: all abi-descriptor.xml rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz mkdir abi-check-headers - cp ../config.h *.h abi-check-headers/ + cp ../config.h ../ws_symbol_export.h *.h abi-check-headers/ abi-compliance-checker -l libwsutil -v1 `readlink .libs/libwsutil.so | sed 's/.*\.so\.//'` \ -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ cat logs/libwsutil/[0-9]*/log.txt |