Fixed Library add's for libyaz_la, libyaz_icu.la, libyaz_server.la.

Fixed Library add's for libyaz.la, libyaz_icu.la, libyaz_server.la.
This partially fixes bug #2129: dpkg-shlibdeps warnings.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3bfc92d..b9b4db5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,9 @@ YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
 libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
 libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)

+libyaz_server_la_LIBADD = libyaz.la

 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)

-libyaz_icu_la_LIBADD = $(ICU_LIBS)
+libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)

 
 AM_YFLAGS=-p cql_
 
 
 AM_YFLAGS=-p cql_
 

diff --git a/test/Makefile.am b/test/Makefile.am
index 4071ba6..debbec0 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -44,7 +44,7 @@ tstodrcodec.c tstodrcodec.h: tstodr.asn $(YAZCOMP)
        cd $(srcdir); $(YAZCOMP) tstodr.asn
 
 LDADD = ../src/libyaz.la
        cd $(srcdir); $(YAZCOMP) tstodr.asn
 
 LDADD = ../src/libyaz.la

-tst_icu_I18N_LDADD = ../src/libyaz_icu.la $(LDADD) $(ICU_LIBS)
+tst_icu_I18N_LDADD = ../src/libyaz_icu.la $(ICU_LIBS)

 
 CONFIG_CLEAN_FILES=*.log
 
 
 CONFIG_CLEAN_FILES=*.log
 

diff --git a/util/Makefile.am b/util/Makefile.am
index 8cf30d5..ddfa3de 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -43,4 +43,4 @@ yaz_illclient_SOURCES = yaz-illclient.c
 yaz_illclient_LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
 yaz_icu_SOURCES = yaz-icu.c
 yaz_illclient_LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
 yaz_icu_SOURCES = yaz-icu.c

-yaz_icu_LDADD =../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
+yaz_icu_LDADD =../src/libyaz_icu.la $(ICU_LIBS)

diff --git a/ztest/Makefile.am b/ztest/Makefile.am
index 7135612..a10a4c4 100644 (file)
--- a/ztest/Makefile.am
+++ b/ztest/Makefile.am
@@ -7,6 +7,6 @@ yaz_ztest_SOURCES=ztest.c read-grs.c read-marc.c
 
 EXTRA_DIST=dummy-records dummy-words dummy-grs ztest.pem config1.xml
 
 
 EXTRA_DIST=dummy-records dummy-words dummy-grs ztest.pem config1.xml
 

-yaz_ztest_LDADD=../src/libyaz_server.la ../src/libyaz.la $(PTHREAD_LIBS)
+yaz_ztest_LDADD=../src/libyaz_server.la $(PTHREAD_LIBS)

 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)