Fix sqlite3 dependencies.

diff --git a/lightmediascanner.pc.in b/lightmediascanner.pc.in
index 9dad103..4577af1 100644 (file)
--- a/lightmediascanner.pc.in
+++ b/lightmediascanner.pc.in
@@ -5,6 +5,7 @@ includedir=@includedir@
 
 Name: lightmediascanner
 Description: Lightweight Media Scanner
+Requires: sqlite3
 Version: @VERSION@
-Libs: -L${libdir} -llightmediascanner -lsqlite3
+Libs: -L${libdir} -llightmediascanner
 Cflags: -I${includedir}

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 174c3a3..3ce2cd3 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,7 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/lib
+       -I$(top_srcdir)/src/lib \
+       @SQLITE3_CFLAGS@
 
 noinst_PROGRAMS = \
        test \

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6c30db5..d262062 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib @SQLITE3_CFLAGS@
 
 include_HEADERS = \
        lightmediascanner.h \

diff --git a/src/plugins/asf/Makefile.am b/src/plugins/asf/Makefile.am
index f4e784c..756e745 100644 (file)
--- a/src/plugins/asf/Makefile.am
+++ b/src/plugins/asf/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/asf
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/asf \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = asf.la

diff --git a/src/plugins/audio-dummy/Makefile.am b/src/plugins/audio-dummy/Makefile.am
index 23667ce..983797f 100644 (file)
--- a/src/plugins/audio-dummy/Makefile.am
+++ b/src/plugins/audio-dummy/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/audio-dummy
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/audio-dummy \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = audio-dummy.la

diff --git a/src/plugins/dummy/Makefile.am b/src/plugins/dummy/Makefile.am
index 7af4e97..7c48b88 100644 (file)
--- a/src/plugins/dummy/Makefile.am
+++ b/src/plugins/dummy/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/dummy
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/dummy \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = dummy.la

diff --git a/src/plugins/id3/Makefile.am b/src/plugins/id3/Makefile.am
index 0e21898..d6c7921 100644 (file)
--- a/src/plugins/id3/Makefile.am
+++ b/src/plugins/id3/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/id3
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/id3 \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = id3.la

diff --git a/src/plugins/jpeg/Makefile.am b/src/plugins/jpeg/Makefile.am
index 6ec341a..a42b284 100644 (file)
--- a/src/plugins/jpeg/Makefile.am
+++ b/src/plugins/jpeg/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/jpeg
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/jpeg \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = jpeg.la

diff --git a/src/plugins/m3u/Makefile.am b/src/plugins/m3u/Makefile.am
index b2332cf..7a7828f 100644 (file)
--- a/src/plugins/m3u/Makefile.am
+++ b/src/plugins/m3u/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/m3u
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/m3u \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = m3u.la

diff --git a/src/plugins/mp4/Makefile.am b/src/plugins/mp4/Makefile.am
index 340eea5..8bec2bb 100644 (file)
--- a/src/plugins/mp4/Makefile.am
+++ b/src/plugins/mp4/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/mp4
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/mp4 \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = mp4.la

diff --git a/src/plugins/ogg/Makefile.am b/src/plugins/ogg/Makefile.am
index cc1ac85..b05dcf4 100644 (file)
--- a/src/plugins/ogg/Makefile.am
+++ b/src/plugins/ogg/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/ogg @VORBIS_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/ogg \
+       @VORBIS_CFLAGS@ @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = ogg.la

diff --git a/src/plugins/pls/Makefile.am b/src/plugins/pls/Makefile.am
index f85b557..f265ad4 100644 (file)
--- a/src/plugins/pls/Makefile.am
+++ b/src/plugins/pls/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/pls
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/pls \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = pls.la

diff --git a/src/plugins/png/Makefile.am b/src/plugins/png/Makefile.am
index 65f9a06..eb19538 100644 (file)
--- a/src/plugins/png/Makefile.am
+++ b/src/plugins/png/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/png
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/png \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = png.la

diff --git a/src/plugins/rm/Makefile.am b/src/plugins/rm/Makefile.am
index 9070c4e..ef6e3fd 100644 (file)
--- a/src/plugins/rm/Makefile.am
+++ b/src/plugins/rm/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/rm
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/rm \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = rm.la

diff --git a/src/plugins/video-dummy/Makefile.am b/src/plugins/video-dummy/Makefile.am
index f40813c..55be128 100644 (file)
--- a/src/plugins/video-dummy/Makefile.am
+++ b/src/plugins/video-dummy/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/video-dummy
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/video-dummy \
+       @SQLITE3_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = video-dummy.la