Merge commit 'upstream/3.1.5'

1 files changed, 84 insertions, 19 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 946fc6c..33521bc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -33,13 +33,17 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = simple-scan$(EXEEXT)
+@HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in book-view.c \
+	book.c page-view.c page.c scanner.c simple-scan.c \
+	simple_scan_vala.stamp ui.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
@@ -51,10 +55,10 @@ am_simple_scan_OBJECTS = simple_scan-book.$(OBJEXT) \
 	simple_scan-scanner.$(OBJEXT) simple_scan-ui.$(OBJEXT)
 simple_scan_OBJECTS = $(am_simple_scan_OBJECTS)
 am__DEPENDENCIES_1 =
-simple_scan_DEPENDENCIES = $(am__DEPENDENCIES_1)
+simple_scan_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 simple_scan_LINK = $(CCLD) $(simple_scan_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -74,6 +78,10 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_$(V))
 am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
 am__v_CCLD_0 = @echo "  CCLD  " $@;
+VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)
+AM_V_VALAC = $(am__v_VALAC_$(V))
+am__v_VALAC_ = $(am__v_VALAC_$(AM_DEFAULT_VERBOSITY))
+am__v_VALAC_0 = @echo "  VALAC " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
@@ -93,6 +101,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COLORD_CFLAGS = @COLORD_CFLAGS@
+COLORD_LIBS = @COLORD_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -107,11 +117,11 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -151,6 +161,7 @@ SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
 SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
+VALAC = @VALAC@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
@@ -172,6 +183,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host_alias = @host_alias@
 htmldir = @htmldir@
 includedir = @includedir@
@@ -197,22 +209,23 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 simple_scan_SOURCES = \
-	book.c \
-	book.h \
-	book-view.c \
-	book-view.h \
-	page.c \
-	page.h \
-	page-view.c \
-	page-view.h \
-	simple-scan.c \
-	scanner.c \
-	scanner.h \
-	ui.c \
-	ui.h
-
+	config.vapi \
+	book.vala \
+	book-view.vala \
+	colord.vapi \
+	jpeglib.vapi \
+	page.vala \
+	page-view.vala \
+	sane.vapi \
+	simple-scan.vala \
+	scanner.vala \
+	ui.vala
+
+simple_scan_VALAFLAGS = --pkg=zlib --pkg=gudev-1.0 --pkg=gio-2.0 \
+	--pkg=gtk+-3.0 $(am__append_1)
 simple_scan_CFLAGS = \
 	$(SIMPLE_SCAN_CFLAGS) \
+	$(COLORD_CFLAGS) \
 	$(WARN_CFLAGS) \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
@@ -224,10 +237,15 @@ simple_scan_CFLAGS = \
 
 simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
+	$(COLORD_LIBS) \
 	-lsane \
 	-ljpeg \
 	-lm
 
+CLEANFILES = \
+	$(patsubst %.vala,%.c,$(filter %.vala, $(SOURCES))) \
+	*_vala.stamp
+
 DISTCLEANFILES = \
 	Makefile.in
 
@@ -447,6 +465,44 @@ simple_scan-ui.obj: ui.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ui.c' object='simple_scan-ui.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-ui.obj `if test -f 'ui.c'; then $(CYGPATH_W) 'ui.c'; else $(CYGPATH_W) '$(srcdir)/ui.c'; fi`
+$(srcdir)/book.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else \
+	  rm -f $(srcdir)/simple_scan_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) simple_scan_vala.stamp; \
+	fi
+$(srcdir)/book-view.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else \
+	  rm -f $(srcdir)/simple_scan_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) simple_scan_vala.stamp; \
+	fi
+$(srcdir)/page.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else \
+	  rm -f $(srcdir)/simple_scan_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) simple_scan_vala.stamp; \
+	fi
+$(srcdir)/page-view.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else \
+	  rm -f $(srcdir)/simple_scan_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) simple_scan_vala.stamp; \
+	fi
+$(srcdir)/simple-scan.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else \
+	  rm -f $(srcdir)/simple_scan_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) simple_scan_vala.stamp; \
+	fi
+$(srcdir)/scanner.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else \
+	  rm -f $(srcdir)/simple_scan_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) simple_scan_vala.stamp; \
+	fi
+$(srcdir)/ui.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else \
+	  rm -f $(srcdir)/simple_scan_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) simple_scan_vala.stamp; \
+	fi
+simple_scan_vala.stamp: $(simple_scan_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C $(simple_scan_SOURCES)
+	$(AM_V_at)touch $@
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -554,6 +610,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -563,6 +620,14 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f book-view.c
+	-rm -f book.c
+	-rm -f page-view.c
+	-rm -f page.c
+	-rm -f scanner.c
+	-rm -f simple-scan.c
+	-rm -f simple_scan_vala.stamp
+	-rm -f ui.c
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am