[tracker/configure-for-binaries: 68/80] libtracker-extract: Merge IPTC/EXIF/EXEMPI into CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 639ca937b85ecc2b274e8c86e9e7a3f3a024954e
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Oct 26 10:58:02 2010 +0100

    libtracker-extract: Merge IPTC/EXIF/EXEMPI into CFLAGS/LIBS

 configure.ac                       |   14 +++++++-------
 src/libtracker-extract/Makefile.am |   12 +++---------
 2 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2232bff..70592b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1543,8 +1543,8 @@ if test "x$enable_libexif" != "xno" ; then
                      [have_libexif=yes],
                      [have_libexif=no])
 
-   AC_SUBST(LIBEXIF_CFLAGS)
-   AC_SUBST(LIBEXIF_LIBS)
+   LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $LIBEXIF_CFLAGS"
+   LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $LIBEXIF_LIBS"
 
    if test "x$have_libexif" = "xyes"; then
       AC_DEFINE(HAVE_LIBEXIF, [], [Define if we have libexif])
@@ -1576,8 +1576,8 @@ if test "x$enable_libiptcdata" != "xno" ; then
                      [have_libiptcdata=yes],
                      [have_libiptcdata=no])
 
-   AC_SUBST(LIBIPTCDATA_CFLAGS)
-   AC_SUBST(LIBIPTCDATA_LIBS)
+   LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $LIBIPTCDATA_CFLAGS"
+   LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $LIBIPTCDATA_LIBS"
 
    if test "x$have_libiptcdata" = "xyes"; then
       AC_DEFINE(HAVE_LIBIPTCDATA, [], [Define if we have libiptcdata])
@@ -1878,9 +1878,9 @@ if test "x$enable_exempi" != "xno" ; then
 
    TRACKER_WRITEBACK_CFLAGS="$TRACKER_WRITEBACK_CFLAGS $EXEMPI_CFLAGS"
    TRACKER_WRITEBACK_LIBS="$TRACKER_WRITEBACK_LIBS $EXEMPI_LIBS"
-  
-   AC_SUBST(EXEMPI_CFLAGS)
-   AC_SUBST(EXEMPI_LIBS)
+
+   LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $EXEMPI_CFLAGS"
+   LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $EXEMPI_LIBS"
 
    if test "x$have_exempi" = "xyes"; then
       AC_DEFINE(HAVE_EXEMPI, [], [Define if we have exempi])
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 7ebc1eb..b5e3185 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -2,13 +2,10 @@ include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS =						\
 	$(BUILD_CFLAGS)					\
-	-DSHAREDIR=\""$(datadir)"\"			\
 	-I$(top_srcdir)/src				\
 	-I$(top_builddir)/src				\
-	$(LIBTRACKER_EXTRACT_CFLAGS)			\
-	$(LIBIPTCDATA_CFLAGS)				\
-	$(LIBEXIF_CFLAGS) 				\
-	$(EXEMPI_CFLAGS)
+	-DSHAREDIR=\""$(datadir)"\"			\
+	$(LIBTRACKER_EXTRACT_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-extract- TRACKER_API_VERSION@.la
 
@@ -42,7 +39,4 @@ libtracker_extract_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)					\
-	$(LIBTRACKER_EXTRACT_LIBS)			\
-	$(LIBIPTCDATA_LIBS)				\
-	$(LIBEXIF_LIBS)					\
-	$(EXEMPI_LIBS)
+	$(LIBTRACKER_EXTRACT_LIBS)