[niepce] Fix the recursive build system: subdirs are build before parent.

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

commit 55d0ab5d1a1ed4997f3777144343fcd2b59fed97
Author: Hub Figuiere <hub figuiere net>
Date:   Thu Nov 17 23:05:39 2011 -0800

    Fix the recursive build system: subdirs are build before parent.

 .gitignore                    |    5 +++--
 camerawire/src/Makefile.am    |    2 +-
 configure.ac                  |    1 +
 src/engine/db/Makefile.am     |    2 +-
 src/fwk/Makefile.am           |   33 +--------------------------------
 src/fwk/base/Makefile.am      |   32 ++++++++++++++++++++++++++++++++
 src/fwk/utils/Makefile.am     |   14 +++++++-------
 src/libraryclient/Makefile.am |    2 +-
 src/niepce/Makefile.am        |    2 +-
 9 files changed, 48 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b22b4d..6e158e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,8 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 po/Makefile.in.in
-src/fwk/testmoniker
-src/fwk/testgeometry
+src/fwk/base/testmoniker
+src/fwk/base/testgeometry
 src/fwk/utils/test_db
 src/fwk/utils/test_db2
 src/fwk/utils/test_db3
@@ -54,4 +54,5 @@ camerawire/po/POTFILES
 doc/Doxyfile
 doc/doxygen/html
 po/*.gmo
+po/niepce.pot
 po/POTFILES
diff --git a/camerawire/src/Makefile.am b/camerawire/src/Makefile.am
index a4e428d..f7d8438 100644
--- a/camerawire/src/Makefile.am
+++ b/camerawire/src/Makefile.am
@@ -20,5 +20,5 @@ camerawire_LDADD = @LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
 	@GCONF_LIBS@ @GPHOTO_LIBS@ \
 	$(top_builddir)/../src/fwk/toolkit/libniepceframework.a \
 	$(top_builddir)/../src/fwk/utils/libniepceutils.a \
-	$(top_builddir)/../src/fwk/libfwk.a \
+	$(top_builddir)/../src/fwk/base/libfwkbase.a \
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index 4c151e1..adfb203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,6 +157,7 @@ src/niepce/modules/darkroom/Makefile
 src/niepce/modules/interfaces/Makefile
 src/niepce/Makefile
 src/fwk/Makefile
+src/fwk/base/Makefile
 src/fwk/utils/Makefile
 src/fwk/utils/db/Makefile
 src/fwk/utils/db/sqlite/Makefile
diff --git a/src/engine/db/Makefile.am b/src/engine/db/Makefile.am
index 5a31415..d28e1f1 100644
--- a/src/engine/db/Makefile.am
+++ b/src/engine/db/Makefile.am
@@ -10,7 +10,7 @@ TEST_LIBS =  \
 	libniepcedb.a \
 	$(top_builddir)/src/fwk/utils/libniepceutils.a \
 	$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
-	$(top_builddir)/src/fwk/libfwk.a \
+	$(top_builddir)/src/fwk/base/libfwkbase.a \
 	@LIBGTKMM_LIBS@ \
 	@BOOST_UNIT_TEST_FRAMEWORK_LIBS@ \
 	@LIBGLIBMM_LIBS@ \
diff --git a/src/fwk/Makefile.am b/src/fwk/Makefile.am
index 1013211..167f3d6 100644
--- a/src/fwk/Makefile.am
+++ b/src/fwk/Makefile.am
@@ -1,33 +1,2 @@
-SUBDIRS = utils toolkit
+SUBDIRS = base utils toolkit
 
-
-INCLUDES = -I$(top_srcdir)/src \
-	@BOOST_CPPFLAGS@ \
-	$(NULL)
-
-noinst_LIBRARIES = libfwk.a
-
-
-TESTS = testmoniker testgeometry
-
-check_PROGRAMS = testmoniker testgeometry
-
-testmoniker_SOURCES = base/t/testmoniker.cpp
-testmoniker_LDADD = libfwk.a \
-	@LIBGLIBMM_LIBS@
-
-testgeometry_SOURCES = base/t/testgeometry.cpp
-testgeometry_LDADD = libfwk.a \
-	@LIBGLIBMM_LIBS@
-
-
-libfwk_a_SOURCES = base/color.hpp base/color.cpp \
-	base/autoflag.hpp \
-	base/debug.hpp base/debug.cpp \
-	base/fractions.hpp base/fractions.cpp \
-	base/moniker.hpp base/moniker.cpp \
-	base/geometry.hpp base/geometry.cpp \
-	base/singleton.hpp \
-	base/map.hpp \
-	base/propertybag.hpp base/propertybag.cpp \
-	$(NULL)
diff --git a/src/fwk/base/Makefile.am b/src/fwk/base/Makefile.am
new file mode 100644
index 0000000..a2b90c2
--- /dev/null
+++ b/src/fwk/base/Makefile.am
@@ -0,0 +1,32 @@
+
+INCLUDES = -I$(top_srcdir)/src \
+	@BOOST_CPPFLAGS@ \
+	$(NULL)
+
+noinst_LIBRARIES = libfwkbase.a
+
+
+TESTS = testmoniker testgeometry
+
+check_PROGRAMS = testmoniker testgeometry
+
+testmoniker_SOURCES = t/testmoniker.cpp
+testmoniker_LDADD = libfwkbase.a \
+	@LIBGLIBMM_LIBS@
+
+testgeometry_SOURCES = t/testgeometry.cpp
+testgeometry_LDADD = libfwkbase.a \
+	@LIBGLIBMM_LIBS@
+
+
+
+libfwkbase_a_SOURCES = color.hpp color.cpp \
+	autoflag.hpp \
+	debug.hpp debug.cpp \
+	fractions.hpp fractions.cpp \
+	moniker.hpp moniker.cpp \
+	geometry.hpp geometry.cpp \
+	singleton.hpp \
+	map.hpp \
+	propertybag.hpp propertybag.cpp \
+	$(NULL)
diff --git a/src/fwk/utils/Makefile.am b/src/fwk/utils/Makefile.am
index 519c4e5..dc77e2a 100644
--- a/src/fwk/utils/Makefile.am
+++ b/src/fwk/utils/Makefile.am
@@ -17,19 +17,19 @@ check_PROGRAMS = testfiles testxmp \
 
 testfiles_SOURCES = testfiles.cpp
 testfiles_LDADD = libniepceutils.a \
-	../libfwk.a \
+	../base/libfwkbase.a \
 	@LIBGLIBMM_LIBS@
 
 
 testxmp_SOURCES = testxmp.cpp
 testxmp_LDADD = libniepceutils.a \
-	../libfwk.a \
+	../base/libfwkbase.a \
 	@EXEMPI_LIBS@ @LIBGLIBMM_LIBS@
 
 testufrawmeta_SOURCES = testufrawmeta.cpp
 testufrawmeta_CXXFLAGS =  -g -O0
 testufrawmeta_LDADD = libniepceutils.a \
-	../libfwk.a \
+	../base/libfwkbase.a \
 	@EXEMPI_LIBS@ @LIBXML2_LIBS@ \
 	@LIBGLIBMM_LIBS@
 
@@ -43,25 +43,25 @@ testpathutils_LDADD = libniepceutils.a \
 
 test_db_SOURCES = db/test_db.cpp
 test_db_LDADD = libniepceutils.a \
-	../libfwk.a \
+	../base/libfwkbase.a \
 	@LIBGLIBMM_LIBS \
 	@SQLITE3_LIBS@
 
 test_db2_SOURCES = db/test_db2.cpp
 test_db2_LDADD = libniepceutils.a \
-	../libfwk.a \
+	../base/libfwkbase.a \
 	@LIBGLIBMM_LIBS \
 	@SQLITE3_LIBS@
 
 test_db3_SOURCES = db/test_db3.cpp
 test_db3_LDADD = libniepceutils.a \
-	../libfwk.a \
+	../base/libfwkbase.a \
 	@LIBGLIBMM_LIBS \
 	@SQLITE3_LIBS@
 
 test_db4_SOURCES = db/test_db4.cpp
 test_db4_LDADD = libniepceutils.a \
-	../libfwk.a \
+	../base/libfwkbase.a \
 	@LIBGLIBMM_LIBS \
 	@SQLITE3_LIBS@
 
diff --git a/src/libraryclient/Makefile.am b/src/libraryclient/Makefile.am
index 121da4a..2708fd3 100644
--- a/src/libraryclient/Makefile.am
+++ b/src/libraryclient/Makefile.am
@@ -12,7 +12,7 @@ TEST_LIBS =  \
 	$(top_builddir)/src/engine/db/libniepcedb.a \
         $(top_builddir)/src/fwk/utils/libniepceutils.a \
 	$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
-	$(top_builddir)/src/fwk/libfwk.a \
+	$(top_builddir)/src/fwk/base/libfwkbase.a \
         @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ \
 	@LIBGLIBMM_LIBS@ \
 	@LIBGTKMM_LIBS@ @SQLITE3_LIBS@ @OPENRAW_LIBS@ \
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index 521b4ef..e35ea31 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -22,7 +22,7 @@ niepce_LDADD = \
 	$(top_builddir)/src/niepce/modules/interfaces/libinterfaces.a \
 	$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
 	$(top_builddir)/src/fwk/utils/libniepceutils.a \
-	$(top_builddir)/src/fwk/libfwk.a \
+	$(top_builddir)/src/fwk/base/libfwkbase.a \
 	$(top_builddir)/src/ncr/libncr.a \
 	$(top_builddir)/src/ext/libview/libview.a \
 	@LIBGLIBMM_LIBS@ \