Merge branch 'release/debian/5.2-1_exp1'HEADdebian/5.2-1_exp1master

1 files changed, 3 insertions, 5 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f28c0a6..2e26d7e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,8 @@ libHX_la_SOURCES = deque.c dl.c format.c io.c map.c \
                    mc.c misc.c opt.c proc.c \
                    rand.c socket.c string.c time.c
 libHX_la_LIBADD  = ${libdl_LIBS} -lm ${libpthread_LIBS} ${librt_LIBS} ${libsocket_LIBS}
-libHX_la_LDFLAGS = -no-undefined -version-info 40:0:8
-if WITH_GNU_LD
+libHX_la_LDFLAGS = -no-undefined -version-info 43:0:0
+if WITH_LDSYM
 libHX_la_LDFLAGS += -Wl,--version-script=${srcdir}/libHX.map
 endif
 if WITH_SUN_LD
@@ -60,7 +60,7 @@ if HAVE_CXX
 check_PROGRAMS    += tx-compile tx-cast tx-deque tx-dir \
                      tx-intdiff tx-list tx-list2 \
                      tx-misc tx-netio \
-                     tx-option tx-proc tx-rand tx-strchr2 tx-string \
+                     tx-proc tx-rand tx-strchr2 tx-string \
                      tx-strquote tx-time
 TESTS             += tx-strchr2 tx-strquote
 tx_cast_SOURCES    = tx-cast.cpp
@@ -80,8 +80,6 @@ tx_misc_SOURCES    = tx-misc.cpp
 tx_misc_LDADD      = libHX.la
 tx_netio_SOURCES   = tx-netio.cpp
 tx_netio_LDADD     = libHX.la ${libsocket_LIBS}
-tx_option_SOURCES  = tx-option.cpp
-tx_option_LDADD    = libHX.la
 tx_proc_SOURCES    = tx-proc.cpp
 tx_proc_LDADD      = libHX.la
 tx_rand_SOURCES    = tx-rand.cpp