diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2013-02-28 19:35:59 +0000 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2013-02-28 19:35:59 +0000 |
| commit | aa659985a586d2d2173d457dea8d1b4346e205e8 (patch) | |
| tree | 6ec6595ee9f193b8551ea592a2622bb10a7d8e1f /wiretap/Makefile.am | |
| parent | 6c29b9edd6db4cfa809a8ede8d22539df117dffe (diff) | |
| download | wireshark-aa659985a586d2d2173d457dea8d1b4346e205e8.tar.gz | |
Export libwiretap symbols using WS_DLL_PUBLIC define
TODO: hide flex-generated functions
svn path=/trunk/; revision=47948
Diffstat (limited to 'wiretap/Makefile.am')
| -rw-r--r-- | wiretap/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 30a1671705..e1a8178b4e 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -30,10 +30,12 @@ include Makefile.common noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 0:0:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ + +AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL @COMPILE_HIDE_SYMBOLS@ if HAVE_WARNINGS_AS_ERRORS -AM_NON_GENERATED_CFLAGS = -Werror +AM_NON_GENERATED_CFLAGS += -Werror endif INCLUDES = -I$(srcdir)/.. @@ -43,7 +45,6 @@ CLEANFILES = \ libwiretap.la \ libwiretap_generated.a \ libwiretap_generated.la \ - wtap.sym \ *~ MAINTAINERCLEANFILES = \ @@ -68,12 +69,11 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ libwiretap.vcproj \ - wtap.def \ $(GENERATOR_FILES) \ $(GENERATED_FILES) libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) -libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la wtap.sym +libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la RUNLEX = $(top_srcdir)/tools/runlex.sh @@ -96,7 +96,7 @@ ascend.c ascend.h: ascend.y dumpabi-libwiretap: all abi-descriptor.xml rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz mkdir abi-check-headers - cp *.h abi-check-headers/ + cp *.h ../ws_symbol_export.h abi-check-headers/ abi-compliance-checker -l libwiretap -v1 `readlink .libs/libwiretap.so | sed 's/.*\.so\.//'` \ -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ cat logs/libwiretap/[0-9]*/log.txt |