Commit f2574ae2 authored by Martyn Russell's avatar Martyn Russell

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

This is to remain consistent with other public APIs
parent b04279f7
......@@ -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)
......
......@@ -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) \
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment