diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-12-07 18:31:50 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-12-07 18:31:50 +0000 |
| commit | d6eff0493cc7989bcf75663e45a4c1835306d25a (patch) | |
| tree | 4d1286f50ecb861127ce53bd905e7d3906060867 | |
| parent | fb83d1bba8176e3d31c2a724583889aa5a095e9f (diff) | |
| download | wireshark-d6eff0493cc7989bcf75663e45a4c1835306d25a.tar.gz wireshark-d6eff0493cc7989bcf75663e45a4c1835306d25a.tar.bz2 wireshark-d6eff0493cc7989bcf75663e45a4c1835306d25a.zip | |
Revert rev 35145 for wsutil: go back to exporting all symbols. libwsutil's list of exported symbols includes our optional targets and trying to export symbols that don't (always) exist upsets some linkers. Anyway, the list of global symbols in libwsutil is (so far) quite short.
svn path=/trunk/; revision=35147
| -rw-r--r-- | wsutil/Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index e17c488e34..9b00cee8d4 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -22,8 +22,6 @@ ACLOCAL_AMFLAGS = `../aclocal-flags` -include ../Makefile.am.inc - include Makefile.common if HAVE_WARNINGS_AS_ERRORS @@ -42,7 +40,7 @@ wsutil_optional_objects = \ @STRPTIME_LO@ lib_LTLIBRARIES = libwsutil.la -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)/.. @@ -65,8 +63,7 @@ EXTRA_libwsutil_la_SOURCES= \ wsgetopt.h libwsutil_la_DEPENDENCIES= \ - $(wsutil_optional_objects) \ - libwsutil.sym + $(wsutil_optional_objects) libwsutil_la_LIBADD = \ @GLIB_LIBS@ \ @@ -84,7 +81,6 @@ EXTRA_DIST = \ CLEANFILES = \ libwsutil.a \ libwsutil.la \ - libwsutil.sym \ *~ MAINTAINERCLEANFILES = \ |