From 72011b1abdb331ba835cbf40cabc9aee42e7847a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 5 Apr 2008 22:46:11 +0200 Subject: [PATCH] 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. --- src/Makefile.am | 3 ++- test/Makefile.am | 2 +- util/Makefile.am | 2 +- ztest/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3bfc92d..b9b4db5 100644 --- 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) +libyaz_server_la_LIBADD = libyaz.la 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_ diff --git a/test/Makefile.am b/test/Makefile.am index 4071ba6..debbec0 100644 --- 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 -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 diff --git a/util/Makefile.am b/util/Makefile.am index 8cf30d5..ddfa3de 100644 --- 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_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 --- 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 -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) -- 1.7.10.4