Due to broken libtool that is unable to track dependencies

	of noinst libraries we are forced to explicitely point
	libraries for binary. Fix for the bug #333334.

diff --git a/ChangeLog b/ChangeLog
index 0816e65e62743089f40f3545c8c8c9eaa437a4fe..9efcb168bc22912563309628ccc3e055919b2af8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-2006-05-05  Nickolay V. Shmyrev  <<nshmyrev@yandex.ru>>
+2006-05-05  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * djvu/Makefile.am:
+       * dvi/Makefile.am:
+       * dvi/mdvi-lib/Makefile.am:
+       * properties/Makefile.am:
+       * ps/Makefile.am:
+       * shell/Makefile.am:
+       * thumbnailer/Makefile.am:
+       
+       Due to broken libtool that is unable to track dependencies
+       of noinst libraries we are forced to explicitely point
+       libraries for binary. Fix for the bug #333334.
+
+2006-05-05  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * data/evince.desktop.in.in:
        * shell/ev-view.c: (view_update_range_and_current_page),

diff --git a/djvu/Makefile.am b/djvu/Makefile.am
index 6fae0dae798bd9130ec3778c1189f304ca1e6ae1..630496a4dc7e1c24541ff7c90fee36d141d6beb0 100644 (file)
--- a/djvu/Makefile.am
+++ b/djvu/Makefile.am
@@ -17,6 +17,5 @@ libgtkdjvu_la_SOURCES = \
        djvu-text-page.c \
        djvu-text-page.h
 
-libgtkdjvu_la_LIBADD = -lpthread $(DVJU_LIBS)
 
 

diff --git a/dvi/Makefile.am b/dvi/Makefile.am
index e7d6248262de6a9b6d7cc0bbe4a414f3b58dd98e..169ef132a174ad4359c330f90cb168a3ff2a6741 100644 (file)
--- a/dvi/Makefile.am
+++ b/dvi/Makefile.am
@@ -22,5 +22,3 @@ libgtkdvi_la_LIBADD = mdvi-lib/libmdvi.la
 
 
 
-
-

diff --git a/dvi/mdvi-lib/Makefile.am b/dvi/mdvi-lib/Makefile.am
index 66614963d9a465c8011d88ce341f88fe6d32cdc6..73417e1648a97d1cc285a390e827290601c9aeb9 100644 (file)
--- a/dvi/mdvi-lib/Makefile.am
+++ b/dvi/mdvi-lib/Makefile.am
@@ -38,9 +38,3 @@ libmdvi_la_SOURCES = \
        util.c       \
        vf.c         
 
-libmdvi_la_LIBADD = \
-       -lkpathsea
-
-if WITH_TYPE1_FONTS
-libmdvi_la_LIBADD += -lt1
-endif

diff --git a/properties/Makefile.am b/properties/Makefile.am
index b3c8560c6fa5a394025ec9ed6ccabf2c205edb9e..fab35143ab2813483cb03caee9c0dbae04929ce7 100644 (file)
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -32,4 +32,16 @@ libevince_properties_page_la_LIBADD =                \
        $(FRONTEND_LIBS)                        \
        $(NAUTILUS_LIBS)
 
+if ENABLE_DJVU
+libevince_properties_page_la_LIBADD +=         $(DJVU_LIBS)
+endif
+
+if ENABLE_DJVU
+libevince_properties_page_la_LIBADD +=         -lkpathsea
+endif
+
+if WITH_TYPE1_FONTS
+libevince_properties_page_la_LIBADD += -lt1
+endif
+
 libevince_properties_page_la_LDFLAGS = -module -avoid-version -no-undefined

diff --git a/ps/Makefile.am b/ps/Makefile.am
index a0ba27cbe2d2952116c9ffd643f14cd020da91e1..a9f25f922ced0a312abb502b8b7aa808cbc94d70 100644 (file)
--- a/ps/Makefile.am
+++ b/ps/Makefile.am
@@ -20,4 +20,3 @@ libpsdocument_la_SOURCES =    \
        gsdefaults.c            \
        gsdefaults.h
 
-libpsdocument_la_LIBADD = $(PS_LIBS)

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4061c31de108f563f321f2342b419c50d37747be..80764d295e7ffbfd0d550b2cebac74b4afa98fb3 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -83,6 +83,18 @@ evince_LDADD=                                                                \
        $(SHELL_LIBS)                                                   \
        $(GNOME_PRINT_LIBS)
 
+if ENABLE_DJVU
+evince_LDADD +=        $(DJVU_LIBS)
+endif
+
+if ENABLE_DJVU
+evince_LDADD +=        -lkpathsea
+endif
+
+if WITH_TYPE1_FONTS
+evince_LDADD += -lt1
+endif
+
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
 if ENABLE_DBUS

diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 8e2473133c2763ab4084b311edc18d41c069dd5f..3bce3f91ea36b91dfe252468b4e95b8da7469c1b 100644 (file)
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -20,6 +20,17 @@ evince_thumbnailer_LDADD=            \
        $(FRONTEND_LIBS)                \
        $(DJVU_LIBS)
 
+if ENABLE_DJVU
+evince_thumbnailer_LDADD += $(DJVU_LIBS)
+endif
+
+if ENABLE_DJVU
+evince_thumbnailer_LDADD += -lkpathsea
+endif
+
+if WITH_TYPE1_FONTS
+evince_thumbnailer_LDADD += -lt1
+endif
 
 schema_files = \
        evince-thumbnailer-dvi.schemas.in  \