summaryrefslogtreecommitdiff
path: root/data/Makefile.in
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-07-25 09:34:56 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-07-25 09:34:56 +0200
commitddf857a5b8dd4b8bb0549033c97448738659e0ae (patch)
tree0a9c3f110ceee0fd2b55deb4266c654a9af4b663 /data/Makefile.in
parent73a4a80d6dde4ba299bee2a9acccd66c9bb35718 (diff)
parentced7e763a5dbecf8ac3047badb320c84c1aadca2 (diff)
Merge tag 'upstream/3.17.4'
Upstream version 3.17.4
Diffstat (limited to 'data/Makefile.in')
-rw-r--r--data/Makefile.in23
1 files changed, 17 insertions, 6 deletions
diff --git a/data/Makefile.in b/data/Makefile.in
index fa2c5b0..c997fbb 100644
--- a/data/Makefile.in
+++ b/data/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 \
?) ;; \
@@ -77,8 +87,6 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_man1_MANS)
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 \
@@ -86,6 +94,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 =
@@ -176,6 +185,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -356,7 +366,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign data/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -714,6 +723,8 @@ uninstall-man: uninstall-man1
tags-am uninstall uninstall-am uninstall-desktopDATA \
uninstall-man uninstall-man1
+.PRECIOUS: Makefile
+
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@