--- digikam/Makefile.am +++ digikam/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = sqlite libs utilities digikam kioslave imageplugins data showfoto +SUBDIRS = libs utilities digikam kioslave imageplugins data showfoto EXTRA_DIST = Digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm --- digikam/digikam/Makefile.am +++ digikam/digikam/Makefile.am @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/digikam/sqlite \ +INCLUDES = \ -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/levels \ -I$(top_srcdir)/digikam/libs/curves \ @@ -91,8 +91,7 @@ upgradedb_sqlite2tosqlite3.cpp libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) \ - $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) \ - $(top_builddir)/digikam/sqlite/libsqlite.la \ + $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) -lsqlite \ $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \ $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \ $(top_builddir)/digikam/libs/widgets/libwidgets.la \