From 68525a359fcf1c2f857337aaac6508861d305cae Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Fri, 05 May 2006 15:29:03 +0000
Subject: 	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 0816e65..9efcb16 100644
--- 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 6fae0da..630496a 100644
--- 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 e7d6248..169ef13 100644
--- 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 6661496..73417e1 100644
--- 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 b3c8560..fab3514 100644
--- 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 a0ba27c..a9f25f9 100644
--- 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 4061c31..80764d2 100644
--- 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 8e24731..3bce3f9 100644
--- 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  \
--
cgit v0.9.1