diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-07-25 09:34:47 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-07-25 09:34:47 +0200 | 
| commit | ced7e763a5dbecf8ac3047badb320c84c1aadca2 (patch) | |
| tree | 73c6e6c8586a7c4fb2482c7b045ea0d61379bbee /src | |
| parent | c2b991e03eeccb2c87efb12455bb674caa083f15 (diff) | |
Imported Upstream version 3.17.4upstream/3.17.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 28 | 
1 files changed, 20 insertions, 8 deletions
| diff --git a/src/Makefile.in b/src/Makefile.in index 587b9b4..c47e058 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am.  # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc.  # This Makefile.in is free software; the Free Software Foundation  # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@  @SET_MAKE@  VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ +  if test -z '$(MAKELEVEL)'; then \ +    false; \ +  elif test -n '$(MAKE_HOST)'; then \ +    true; \ +  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ +    true; \ +  else \ +    false; \ +  fi; \ +}  am__make_running_with_option = \    case $${target_option-} in \        ?) ;; \ @@ -79,10 +89,6 @@ POST_UNINSTALL = :  bin_PROGRAMS = simple-scan$(EXEEXT)  @HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD  subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am book.c \ -	book-view.c page.c page-view.c simple-scan.c scanner.c ui.c \ -	autosave-manager.c $(top_srcdir)/depcomp \ -	$(srcdir)/simple_scan_vala.stamp  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \  	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ @@ -90,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \  	$(top_srcdir)/configure.ac  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \  	$(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)  mkinstalldirs = $(install_sh) -d  CONFIG_CLEAN_FILES =  CONFIG_CLEAN_VPATH_FILES = @@ -170,6 +177,10 @@ am__define_uniq_tagged_files = \    done | $(am__uniquify_input)`  ETAGS = etags  CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ +	$(srcdir)/simple_scan_vala.stamp $(top_srcdir)/depcomp \ +	autosave-manager.c book-view.c book.c page-view.c page.c \ +	scanner.c simple-scan.c ui.c  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)  ACLOCAL = @ACLOCAL@  ALL_LINGUAS = @ALL_LINGUAS@ @@ -355,7 +366,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi  	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \  	$(am__cd) $(top_srcdir) && \  	  $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status  	@case '$?' in \  	  *config.status*) \ @@ -843,6 +853,8 @@ uninstall-am: uninstall-binPROGRAMS  	ps ps-am tags tags-am uninstall uninstall-am \  	uninstall-binPROGRAMS +.PRECIOUS: Makefile +  resources.c: $(top_srcdir)/data/simple-scan.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data/ $(top_srcdir)/data/simple-scan.gresource.xml)  	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data/ --generate-source $< | 
