[tracker] libtracker-extract: Fixed libdir to $prefix/lib and .la to use version

[Martyn James Russell <mr src gnome org>]

commit f2574ae2cfc5b6a159898d6bca75b83f387425e0
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Jan 20 15:39:04 2010 +0000

    libtracker-extract: Fixed libdir to $prefix/lib and .la to use version
    
    This is to remain consistent with other public APIs

 docs/reference/libtracker-extract/Makefile.am |    2 +-
 src/libtracker-extract/Makefile.am            |   14 ++++++--------
 src/tracker-extract/Makefile.am               |   10 +++++-----
 3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/docs/reference/libtracker-extract/Makefile.am b/docs/reference/libtracker-extract/Makefile.am
index b08b203..8f01a10 100644
--- a/docs/reference/libtracker-extract/Makefile.am
+++ b/docs/reference/libtracker-extract/Makefile.am
@@ -32,7 +32,7 @@ INCLUDES = 								\
 	$(GLIB2_CFLAGS)
 
 GTKDOC_LIBS =								\
-	$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
+	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(GLIB2_LIBS)
 
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 121aa37..2ddde75 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -14,13 +14,11 @@ INCLUDES =						\
 	$(LIBEXIF_CFLAGS) 				\
 	$(EXEMPI_CFLAGS)
 
-libtracker_extractdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-libtracker_extractincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-extract/
-libtracker_extract_LTLIBRARIES = libtracker-extract.la
+lib_LTLIBRARIES = libtracker-extract- TRACKER_API_VERSION@.la
 
-# $(marshal_sources)				
+libtracker_extractincdir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-extract/
 
-libtracker_extract_la_SOURCES =	 			\
+libtracker_extract_ TRACKER_API_VERSION@_la_SOURCES =	\
 	tracker-extract.h				\
 	tracker-exif.c					\
 	tracker-exif.h					\
@@ -31,16 +29,16 @@ libtracker_extract_la_SOURCES =	 			\
 
 noinst_HEADERS =
 
-libtracker_extractinclude_HEADERS =			\
+libtracker_extractinc_HEADERS =				\
 	tracker-extract.h				\
 	tracker-exif.h					\
 	tracker-iptc.h					\
 	tracker-xmp.h
 
-libtracker_extract_la_LDFLAGS = 			\
+libtracker_extract_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-libtracker_extract_la_LIBADD = 				\
+libtracker_extract_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(GIO_LIBS)					\
 	$(GCOV_LIBS)					\
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 6ec8364..f3bc51d 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -143,8 +143,8 @@ libextract_oasis_la_LIBADD = 						\
 libextract_png_la_SOURCES = tracker-extract-png.c
 libextract_png_la_LDFLAGS = $(module_flags)
 libextract_png_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
 	$(GLIB2_LIBS) 							\
 	$(LIBPNG_LIBS) 							\
 	$(GCOV_LIBS)
@@ -169,8 +169,8 @@ libextract_totem_la_LIBADD = 						\
 libextract_xmp_la_SOURCES = tracker-extract-xmp.c
 libextract_xmp_la_LDFLAGS = $(module_flags)
 libextract_xmp_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
 	$(GLIB2_LIBS) 							\
 	$(GCOV_LIBS)
 
@@ -196,8 +196,8 @@ libextract_msoffice_la_LIBADD = 					\
 libextract_pdf_la_SOURCES = tracker-extract-pdf.c
 libextract_pdf_la_LDFLAGS = $(module_flags)
 libextract_pdf_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
 	$(POPPLER_GLIB_LIBS)						\
 	$(GLIB2_LIBS)							\
 	$(GCOV_LIBS)
@@ -233,8 +233,8 @@ libextract_xine_la_LIBADD = 						\
 libextract_jpeg_la_SOURCES = tracker-extract-jpeg.c
 libextract_jpeg_la_LDFLAGS = $(module_flags)
 libextract_jpeg_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
 	$(LIBJPEG_LIBS) 						\
 	$(GLIB2_LIBS) 							\
 	$(GCOV_LIBS)
@@ -243,8 +243,8 @@ libextract_jpeg_la_LIBADD = 						\
 libextract_tiff_la_SOURCES = tracker-extract-tiff.c $(xmp_sources) $(iptc_sources)
 libextract_tiff_la_LDFLAGS = $(module_flags)
 libextract_tiff_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
 	$(LIBTIFF_LIBS) 						\
 	$(GLIB2_LIBS) 							\
 	$(GCOV_LIBS)