eog r4894 - in trunk: . doc/reference jpegutils src
- From: friemann svn gnome org
- To: svn-commits-list gnome org
- Subject: eog r4894 - in trunk: . doc/reference jpegutils src
- Date: Fri, 5 Dec 2008 12:36:34 +0000 (UTC)
Author: friemann
Date: Fri Dec 5 12:36:34 2008
New Revision: 4894
URL: http://svn.gnome.org/viewvc/eog?rev=4894&view=rev
Log:
2008-12-05 Felix Riemann <friemann svn gnome org>
* jpegutils/Makefile.am: Produce .la-file as well.
* doc/reference/Makefile.am:
* src/Makefile.am:
Link to local convenience libs directly instead of using a
library search path to avoid linking to wrong libs. Let automake
calculate the dependencies list. Remove now unneeded vars.
Fixes bug #560073 (Daniel Macks, Felix Riemann).
Modified:
trunk/ChangeLog
trunk/doc/reference/Makefile.am
trunk/jpegutils/Makefile.am
trunk/src/Makefile.am
Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am (original)
+++ trunk/doc/reference/Makefile.am Fri Dec 5 12:36:34 2008
@@ -91,13 +91,13 @@
endif
if ENABLE_JPEG
-jpeg_LIB = -L$(top_builddir)/jpegutils -leog-jpegutils
+jpeg_LIB = $(top_builddir)/jpegutils/libeog-jpegutils.la
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: trunk/jpegutils/Makefile.am
==============================================================================
--- trunk/jpegutils/Makefile.am (original)
+++ trunk/jpegutils/Makefile.am Fri Dec 5 12:36:34 2008
@@ -1,9 +1,9 @@
INCLUDES = $(EOG_CFLAGS) \
$(EXIF_CFLAGS)
-noinst_LIBRARIES = libeog-jpegutils.a
+noinst_LTLIBRARIES = libeog-jpegutils.la
-libeog_jpegutils_a_SOURCES = \
+libeog_jpegutils_la_SOURCES = \
transupp.c \
transupp.h
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Fri Dec 5 12:36:34 2008
@@ -1,13 +1,10 @@
if ENABLE_JPEG
-jpeg_LIB = -L$(top_builddir)/jpegutils -leog-jpegutils
-jpeg_DEPS = $(top_builddir)/jpegutils/libeog-jpegutils.a
+jpeg_LIB = $(top_builddir)/jpegutils/libeog-jpegutils.la
endif
-toolbar_LIB = -L$(top_builddir)/cut-n-paste/toolbar-editor -ltoolbareditor
-toolbar_DEPS = $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la
+toolbar_LIB = $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la
-screensaver_LIB = -L$(top_builddir)/cut-n-paste/totem-screensaver -ltotemscrsaver
-screensaver_DEPS = $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la
+screensaver_LIB = $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la
noinst_LTLIBRARIES = libeog.la
@@ -172,12 +169,6 @@
eog_SOURCES = main.c
-eog_DEPENDENCIES = \
- libeog.la \
- $(jpeg_DEPS) \
- $(toolbar_DEPS) \
- $(screensaver_DEPS)
-
eog_CFLAGS = \
-I$(top_srcdir)/cut-n-paste/toolbar-editor \
-I$(top_srcdir)/cut-n-paste/totem-screensaver \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]