eog r4893 - in branches/gnome-2-24: . doc/reference src

[friemann svn gnome org]

Author: friemann
Date: Fri Dec  5 12:32:35 2008
New Revision: 4893
URL: http://svn.gnome.org/viewvc/eog?rev=4893&view=rev

Log:
2008-12-05  Felix Riemann  <friemann svn gnome org>

	* doc/reference/Makefile.am:
	* src/Makefile.am:
	Link local convenience libs directly instead of using a
	library	search 	path to avoid linking to wrong libs.
	Fixes bug #560073 (Daniel Macks).


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/doc/reference/Makefile.am
   branches/gnome-2-24/src/Makefile.am

Modified: branches/gnome-2-24/doc/reference/Makefile.am
==============================================================================
--- branches/gnome-2-24/doc/reference/Makefile.am	(original)
+++ branches/gnome-2-24/doc/reference/Makefile.am	Fri Dec  5 12:32:35 2008
@@ -91,13 +91,13 @@
 endif
 
 if ENABLE_JPEG
-jpeg_LIB = -L$(top_builddir)/jpegutils -leog-jpegutils
+jpeg_LIB = $(top_builddir)/jpegutils/libeog-jpegutils.a
 endif
 
 GTKDOC_LIBS=\
 	$(top_builddir)/src/libeog.la 	\
-	-L$(top_builddir)/cut-n-paste/toolbar-editor -ltoolbareditor \
-	-L$(top_builddir)/cut-n-paste/totem-screensaver -ltotemscrsaver \
+	$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \
+	$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \
 	$(BINDING_LIBS)			\
 	$(LIBJPEG)			\
 	$(X_LIBS)			\

Modified: branches/gnome-2-24/src/Makefile.am
==============================================================================
--- branches/gnome-2-24/src/Makefile.am	(original)
+++ branches/gnome-2-24/src/Makefile.am	Fri Dec  5 12:32:35 2008
@@ -1,12 +1,12 @@
 if ENABLE_JPEG
-jpeg_LIB = -L$(top_builddir)/jpegutils -leog-jpegutils
+jpeg_LIB = $(top_builddir)/jpegutils/libeog-jpegutils.a
 jpeg_DEPS = $(top_builddir)/jpegutils/libeog-jpegutils.a
 endif
 
-toolbar_LIB = -L$(top_builddir)/cut-n-paste/toolbar-editor -ltoolbareditor
+toolbar_LIB = $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la
 toolbar_DEPS = $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la
 
-screensaver_LIB = -L$(top_builddir)/cut-n-paste/totem-screensaver -ltotemscrsaver
+screensaver_LIB = $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la
 screensaver_DEPS = $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la
 
 noinst_LTLIBRARIES = libeog.la