[niepce] De-recursify engine.

[Hubert Figuière <hub src gnome org>]

commit df6b820e94a954514bf217bdcf868a717624be4e
Author: Hubert Figuière <hub figuiere net>
Date:   Tue Sep 16 23:13:43 2014 -0400

    De-recursify engine.

 .gitignore                     |    4 +-
 configure.ac                   |    2 -
 src/engine/Makefile.am         |   51 +++++++++++++++++++++++++++++++++++++++-
 src/engine/db/Makefile.am      |   39 ------------------------------
 src/engine/library/Makefile.am |   28 ----------------------
 5 files changed, 52 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ef2eec8..648fdd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,8 +54,8 @@ src/fwk/utils/testufrawmeta
 src/fwk/utils/testxmp
 src/fwk/toolkit/testconfigdatabinder
 src/libraryclient/test_worker
-src/engine/db/test_library
-src/engine/db/test_filebundle
+src/engine/test_library
+src/engine/test_filebundle
 src/engine/library/test_opqueue
 src/niepce/niepce
 camerawire/src/camerawire
diff --git a/configure.ac b/configure.ac
index be8cc22..f31c5b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,8 +146,6 @@ src/fwk/utils/db/Makefile
 src/fwk/utils/db/sqlite/Makefile
 src/fwk/toolkit/Makefile
 src/engine/Makefile
-src/engine/db/Makefile
-src/engine/library/Makefile
 src/libraryclient/Makefile
 src/ncr/Makefile
 po/Makefile.in
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 7a216b0..1ed8d38 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -1,3 +1,52 @@
 
 
-SUBDIRS = db library
\ No newline at end of file
+AM_CPPFLAGS = -I$(top_srcdir)/src/  @FRAMEWORK_CFLAGS@ \
+       @OPENRAW_CFLAGS@ \
+       $(NULL)
+
+TESTS = test_library test_filebundle test_opqueue
+
+TEST_LIBS =  \
+       libniepceengine.a \
+       $(top_builddir)/src/fwk/utils/libniepceutils.a \
+       $(top_builddir)/src/fwk/toolkit/libniepceframework.a \
+       $(top_builddir)/src/fwk/base/libfwkbase.a \
+       @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ \
+       @FRAMEWORK_LIBS@ \
+       @OPENRAW_LIBS@ \
+       $(NULL)
+
+
+check_PROGRAMS = test_library test_filebundle test_opqueue
+
+test_library_SOURCES = db/test_library.cpp
+test_library_LDADD = $(TEST_LIBS)
+
+test_filebundle_SOURCES = db/test_filebundle.cpp
+test_filebundle_LDADD = $(TEST_LIBS)
+
+test_opqueue_SOURCES = library/test_opqueue.cpp library/opqueue.hpp
+test_opqueue_LDADD = $(TEST_LIBS)
+
+noinst_LIBRARIES = libniepceengine.a
+
+libniepceengine_a_SOURCES = \
+       db/library.hpp db/library.cpp \
+       db/librarytypes.hpp \
+       db/libfile.hpp db/libfile.cpp \
+       db/libfolder.hpp db/libfolder.cpp \
+       db/label.hpp \
+       db/libmetadata.hpp db/libmetadata.cpp \
+       db/keyword.hpp db/keyword.cpp \
+       db/storage.hpp db/storage.cpp \
+       db/fsfile.hpp db/fsfile.cpp \
+       db/filebundle.hpp db/filebundle.cpp \
+       db/metadata.hpp \
+       db/properties.hpp db/properties.cpp \
+       db/properties-def.hpp \
+       library/clienttypes.hpp \
+       library/op.hpp library/op.cpp  \
+       library/commands.hpp library/commands.cpp \
+       library/thumbnailcache.hpp library/thumbnailcache.cpp \
+       library/thumbnailnotification.hpp \
+       $(NULL)