[niepce] build: properly build rust dependencies

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

commit 266f40ad8e97ab7c86db97e58bbcbbb6c41e6a9f
Author: Hubert Figuière <hub figuiere net>
Date:   Thu Nov 2 20:55:03 2017 -0400

    build: properly build rust dependencies
    
    - support verbose mode

 src/Makefile.am        |   68 +++++++++++++++++++++++++++++++++++++++++++++++-
 src/niepce/Makefile.am |   42 +-----------------------------
 2 files changed, 68 insertions(+), 42 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index d6afaae..15eebe4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,71 @@
 
 AM_CPPFLAGS = -DNIEPCE_LOCALEDIR=\"${NIEPCE_LOCALEDIR}\"
 
-SUBDIRS = ext fwk \
+SUBDIRS = . ext fwk \
        engine libraryclient ncr niepce
+
+RUST_SOURCES = \
+       @top_srcdir@/build.rs \
+       @top_srcdir@/Cargo.toml \
+       @top_srcdir@/src/capi.rs \
+       @top_srcdir@/src/engine/db/filebundle.rs \
+       @top_srcdir@/src/engine/db/fsfile.rs \
+       @top_srcdir@/src/engine/db/keyword.rs \
+       @top_srcdir@/src/engine/db/label.rs \
+       @top_srcdir@/src/engine/db/libfile.rs \
+       @top_srcdir@/src/engine/db/libfolder.rs \
+       @top_srcdir@/src/engine/db/libmetadata.rs \
+       @top_srcdir@/src/engine/db/library.rs \
+       @top_srcdir@/src/engine/db/mod.rs \
+       @top_srcdir@/src/engine/library/commands.rs \
+       @top_srcdir@/src/engine/library/mod.rs \
+       @top_srcdir@/src/engine/library/notification.rs \
+       @top_srcdir@/src/engine/library/op.rs \
+       @top_srcdir@/src/engine/mod.rs \
+       @top_srcdir@/src/fwk/base/date.rs \
+       @top_srcdir@/src/fwk/base/debug.rs \
+       @top_srcdir@/src/fwk/base/fractions.rs \
+       @top_srcdir@/src/fwk/base/mod.rs \
+       @top_srcdir@/src/fwk/base/propertybag.rs \
+       @top_srcdir@/src/fwk/base/propertyvalue.rs \
+       @top_srcdir@/src/fwk/base/rgbcolour.rs \
+       @top_srcdir@/src/fwk/mod.rs \
+       @top_srcdir@/src/fwk/toolkit/mimetype.rs \
+       @top_srcdir@/src/fwk/toolkit/mod.rs \
+       @top_srcdir@/src/fwk/utils/exempi.rs \
+       @top_srcdir@/src/fwk/utils/mod.rs \
+       @top_srcdir@/src/lib.rs \
+       @top_srcdir@/src/libraryclient/clientimpl.rs \
+       @top_srcdir@/src/libraryclient/clientinterface.rs \
+       @top_srcdir@/src/libraryclient/libraryclient.rs \
+       @top_srcdir@/src/libraryclient/mod.rs \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(RUST_SOURCES) \
+       $(NULL)
+
+@top_builddir@/target/@CARGO_TARGET_SUBDIR@/libniepce_rust.a: @top_builddir@/target/bindings.h
+
+@top_builddir@/target/bindings.h: $(RUST_SOURCES)
+       cd $(top_srcdir) &&\
+       CARGO_TARGET_DIR=@abs_top_builddir@/target cargo build $(CARGO_VERBOSE) $(CARGO_RELEASE_ARGS)
+
+CARGO_VERBOSE = $(cargo_verbose_$(V))
+cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
+cargo_verbose_0 =
+cargo_verbose_1 = --verbose
+
+if DEBUG
+CARGO_RELEASE_ARGS=
+else
+CARGO_RELEASE_ARGS=--release
+endif
+
+all-local: @top_builddir@/target/@CARGO_TARGET_SUBDIR@/libniepce_rust.a
+
+clean-local:
+       -(cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo clean $(CARGO_RELEASE_ARGS))
+
+check-local:
+       (cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo test $(CARGO_RELEASE_ARGS))
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index cb1a261..6e333f8 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -21,7 +21,7 @@ niepce_LDADD = \
        $(top_builddir)/src/fwk/base/libfwkbase.a \
        $(top_builddir)/src/ncr/libncr.a \
        $(top_builddir)/src/ext/libview/libview.a \
-       $(top_builddir)/target/debug/libniepce_rust.a \
+       $(top_builddir)/target/@CARGO_TARGET_SUBDIR@/libniepce_rust.a \
        $(top_builddir)/src/engine/libniepceengine.a \
        $(top_builddir)/src/fwk/utils/libniepceutils.a \
        $(top_builddir)/src/engine/libniepceengineglue.a \
@@ -37,43 +37,3 @@ niepce_SOURCES = \
        notificationcenter.hpp notificationcenter.cpp \
         notifications.hpp \
        main.cpp
-
-RUST_SOURCES = \
-       @top_srcdir@/src/lib.rs \
-       @top_srcdir@/src/engine/db/keyword.rs \
-       @top_srcdir@/src/engine/db/fsfile.rs \
-       @top_srcdir@/src/engine/db/libfile.rs \
-       @top_srcdir@/src/engine/db/filebundle.rs \
-       @top_srcdir@/src/engine/db/mod.rs \
-       @top_srcdir@/src/engine/db/libfolder.rs \
-       @top_srcdir@/src/engine/db/library.rs \
-       @top_srcdir@/src/engine/mod.rs \
-       @top_srcdir@/src/fwk/utils/exempi.rs \
-       @top_srcdir@/src/fwk/utils/mod.rs \
-       @top_srcdir@/src/fwk/base/fractions.rs \
-       @top_srcdir@/src/fwk/base/mod.rs \
-       @top_srcdir@/src/fwk/mod.rs \
-       @top_srcdir@/src/fwk/toolkit/mimetype.rs \
-       @top_srcdir@/src/fwk/toolkit/mod.rs \
-       @top_srcdir@/build.rs \
-       @top_srcdir@/Cargo.toml \
-       $(NULL)
-
-EXTRA_DIST = \
-       $(RUST_SOURCES) \
-       $(NULL)
-
-@top_builddir@/target/@CARGO_TARGET_SUBDIR@/libniepce_rust.a: $(RUST_SOURCES)
-       (cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo build $(CARGO_RELEASE_ARGS))
-
-if DEBUG
-CARGO_RELEASE_ARGS=
-else
-CARGO_RELEASE_ARGS=--release
-endif
-
-clean-local:
-       -(cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo clean $(CARGO_RELEASE_ARGS))
-
-check-local:
-       (cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo test $(CARGO_RELEASE_ARGS))