diff -Nru mutter-3.29.92/aclocal.m4 mutter-3.30.0/aclocal.m4 --- mutter-3.29.92/aclocal.m4 2018-08-29 16:42:56.000000000 +0000 +++ mutter-3.30.0/aclocal.m4 2018-09-03 22:06:43.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,13 +332,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -346,49 +345,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -397,18 +388,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -495,8 +485,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -563,7 +553,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -605,7 +595,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +616,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -648,7 +638,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -683,7 +673,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -691,49 +681,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -772,7 +755,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -801,7 +784,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -848,7 +831,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -867,7 +850,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -948,7 +931,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1008,7 +991,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1036,7 +1019,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1055,7 +1038,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mutter-3.29.92/build-aux/compile mutter-3.30.0/build-aux/compile --- mutter-3.29.92/build-aux/compile 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/build-aux/compile 2018-09-03 22:06:44.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/build-aux/config.guess mutter-3.30.0/build-aux/config.guess --- mutter-3.29.92/build-aux/config.guess 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/build-aux/config.guess 2018-09-03 22:06:44.000000000 +0000 @@ -1,8 +1,8 @@ -#!/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-08-08' +timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -107,9 +107,9 @@ dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,30 +176,30 @@ # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +215,10 @@ ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,49 +226,55 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; *:Redox:*:*) - echo ${UNAME_MACHINE}-unknown-redox + echo "$UNAME_MACHINE"-unknown-redox exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -313,28 +326,19 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -346,7 +350,7 @@ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -373,19 +377,19 @@ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. @@ -398,13 +402,13 @@ SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -413,25 +417,25 @@ ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -442,44 +446,44 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -488,23 +492,23 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -530,17 +534,17 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -557,7 +561,7 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -569,14 +573,14 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -587,7 +591,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -601,7 +605,7 @@ exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -610,18 +614,18 @@ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -636,28 +640,28 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -690,13 +694,13 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -715,15 +719,15 @@ HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -748,11 +752,11 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -761,7 +765,7 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -769,9 +773,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -796,128 +800,109 @@ echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -931,63 +916,63 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -1001,70 +986,70 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1078,34 +1063,34 @@ # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1115,12 +1100,12 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1130,9 +1115,9 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1152,9 +1137,9 @@ exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1174,9 +1159,9 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1185,28 +1170,28 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1217,7 +1202,7 @@ *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1237,23 +1222,23 @@ exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1272,39 +1257,39 @@ echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ @@ -1332,7 +1317,7 @@ # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1340,22 +1325,25 @@ UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1364,7 +1352,7 @@ echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 @@ -1375,7 +1363,7 @@ else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1396,14 +1384,14 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1412,32 +1400,44 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 </dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.29.92/build-aux/config.sub mutter-3.30.0/build-aux/config.sub --- mutter-3.29.92/build-aux/config.sub 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/build-aux/config.sub 2018-09-03 22:06:44.000000000 +0000 @@ -1,8 +1,8 @@ -#!/bin/sh +#! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-04-02' +timestamp='2018-05-05' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,7 +94,7 @@ *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,28 +110,48 @@ exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; +# Spilt fields of configuration type +IFS="-" read -r field1 field2 field3 field4 <&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -382,7 +403,7 @@ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -423,6 +444,7 @@ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ + | nfp-* \ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ @@ -461,7 +483,7 @@ # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -495,7 +517,7 @@ basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -540,7 +562,7 @@ os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -548,13 +570,13 @@ os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -643,7 +665,7 @@ basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; @@ -652,7 +674,7 @@ os=$os"spe" ;; e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=$os"spe" ;; ebmon29k) @@ -744,9 +766,6 @@ hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -759,26 +778,26 @@ basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -797,19 +816,16 @@ os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -841,10 +857,10 @@ os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -863,7 +879,7 @@ os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -905,7 +921,7 @@ basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -950,6 +966,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; nsx-tandem) basic_machine=nsx-tandem ;; @@ -985,7 +1004,7 @@ os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -1001,7 +1020,7 @@ basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1016,16 +1035,16 @@ basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1035,23 +1054,23 @@ ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1105,17 +1124,10 @@ sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1134,7 +1146,7 @@ os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1248,9 +1260,6 @@ basic_machine=a29k-wrs os=-vxworks ;; - wasm32) - basic_machine=wasm32-unknown - ;; w65*) basic_machine=w65-wdc os=-none @@ -1259,6 +1268,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1267,20 +1279,12 @@ basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1309,10 +1313,6 @@ vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1322,9 +1322,6 @@ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1344,7 +1341,7 @@ # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1352,10 +1349,10 @@ # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1363,11 +1360,11 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1378,18 +1375,19 @@ -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1399,25 +1397,26 @@ | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1434,12 +1433,12 @@ -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1448,10 +1447,10 @@ os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1462,12 +1461,6 @@ -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1492,7 +1485,7 @@ -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1514,7 +1507,7 @@ -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1529,34 +1522,44 @@ -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; -ios) ;; -none) ;; + -*-eabi) + case $basic_machine in + arm*) + ;; + esac + ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1652,9 +1655,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1694,7 +1694,7 @@ m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1709,9 +1709,6 @@ i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1821,15 +1818,15 @@ vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.29.92/build-aux/depcomp mutter-3.30.0/build-aux/depcomp --- mutter-3.29.92/build-aux/depcomp 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/build-aux/depcomp 2018-09-03 22:06:44.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/build-aux/install-sh mutter-3.30.0/build-aux/install-sh --- mutter-3.29.92/build-aux/install-sh 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/build-aux/install-sh 2018-09-03 22:06:44.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,8 +444,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -493,7 +510,7 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/build-aux/missing mutter-3.30.0/build-aux/missing --- mutter-3.29.92/build-aux/missing 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/build-aux/missing 2018-09-03 22:06:44.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/clutter/aclocal.m4 mutter-3.30.0/clutter/aclocal.m4 --- mutter-3.29.92/clutter/aclocal.m4 2018-08-29 16:42:49.000000000 +0000 +++ mutter-3.30.0/clutter/aclocal.m4 2018-09-03 22:06:36.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -579,7 +579,7 @@ rm -f conf.glibtest ]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -591,10 +591,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -610,14 +610,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -669,7 +669,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -700,7 +700,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -891,13 +891,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -905,49 +904,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -956,18 +947,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1054,8 +1044,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -1122,7 +1112,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -1164,7 +1154,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1185,7 +1175,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1206,7 +1196,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1214,49 +1204,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1295,7 +1278,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1324,7 +1307,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1371,7 +1354,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1390,7 +1373,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1471,7 +1454,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1531,7 +1514,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1559,7 +1542,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1578,7 +1561,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mutter-3.29.92/clutter/build/autotools/Makefile.in mutter-3.30.0/clutter/build/autotools/Makefile.in --- mutter-3.29.92/clutter/build/autotools/Makefile.in 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/build/autotools/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -349,8 +349,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -374,7 +374,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/clutter/build/compile mutter-3.30.0/clutter/build/compile --- mutter-3.29.92/clutter/build/compile 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/build/compile 2018-09-03 22:06:37.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/clutter/build/config.guess mutter-3.30.0/clutter/build/config.guess --- mutter-3.29.92/clutter/build/config.guess 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/build/config.guess 2018-09-03 22:06:37.000000000 +0000 @@ -1,8 +1,8 @@ -#!/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-08-08' +timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -107,9 +107,9 @@ dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,30 +176,30 @@ # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +215,10 @@ ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,49 +226,55 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; *:Redox:*:*) - echo ${UNAME_MACHINE}-unknown-redox + echo "$UNAME_MACHINE"-unknown-redox exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -313,28 +326,19 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -346,7 +350,7 @@ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -373,19 +377,19 @@ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. @@ -398,13 +402,13 @@ SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -413,25 +417,25 @@ ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -442,44 +446,44 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -488,23 +492,23 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -530,17 +534,17 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -557,7 +561,7 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -569,14 +573,14 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -587,7 +591,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -601,7 +605,7 @@ exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -610,18 +614,18 @@ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -636,28 +640,28 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -690,13 +694,13 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -715,15 +719,15 @@ HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -748,11 +752,11 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -761,7 +765,7 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -769,9 +773,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -796,128 +800,109 @@ echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -931,63 +916,63 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -1001,70 +986,70 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1078,34 +1063,34 @@ # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1115,12 +1100,12 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1130,9 +1115,9 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1152,9 +1137,9 @@ exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1174,9 +1159,9 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1185,28 +1170,28 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1217,7 +1202,7 @@ *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1237,23 +1222,23 @@ exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1272,39 +1257,39 @@ echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ @@ -1332,7 +1317,7 @@ # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1340,22 +1325,25 @@ UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1364,7 +1352,7 @@ echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 @@ -1375,7 +1363,7 @@ else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1396,14 +1384,14 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1412,32 +1400,44 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 </dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.29.92/clutter/build/config.sub mutter-3.30.0/clutter/build/config.sub --- mutter-3.29.92/clutter/build/config.sub 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/build/config.sub 2018-09-03 22:06:37.000000000 +0000 @@ -1,8 +1,8 @@ -#!/bin/sh +#! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-04-02' +timestamp='2018-05-05' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,7 +94,7 @@ *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,28 +110,48 @@ exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; +# Spilt fields of configuration type +IFS="-" read -r field1 field2 field3 field4 <&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -382,7 +403,7 @@ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -423,6 +444,7 @@ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ + | nfp-* \ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ @@ -461,7 +483,7 @@ # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -495,7 +517,7 @@ basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -540,7 +562,7 @@ os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -548,13 +570,13 @@ os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -643,7 +665,7 @@ basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; @@ -652,7 +674,7 @@ os=$os"spe" ;; e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=$os"spe" ;; ebmon29k) @@ -744,9 +766,6 @@ hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -759,26 +778,26 @@ basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -797,19 +816,16 @@ os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -841,10 +857,10 @@ os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -863,7 +879,7 @@ os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -905,7 +921,7 @@ basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -950,6 +966,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; nsx-tandem) basic_machine=nsx-tandem ;; @@ -985,7 +1004,7 @@ os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -1001,7 +1020,7 @@ basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1016,16 +1035,16 @@ basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1035,23 +1054,23 @@ ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1105,17 +1124,10 @@ sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1134,7 +1146,7 @@ os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1248,9 +1260,6 @@ basic_machine=a29k-wrs os=-vxworks ;; - wasm32) - basic_machine=wasm32-unknown - ;; w65*) basic_machine=w65-wdc os=-none @@ -1259,6 +1268,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1267,20 +1279,12 @@ basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1309,10 +1313,6 @@ vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1322,9 +1322,6 @@ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1344,7 +1341,7 @@ # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1352,10 +1349,10 @@ # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1363,11 +1360,11 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1378,18 +1375,19 @@ -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1399,25 +1397,26 @@ | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1434,12 +1433,12 @@ -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1448,10 +1447,10 @@ os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1462,12 +1461,6 @@ -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1492,7 +1485,7 @@ -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1514,7 +1507,7 @@ -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1529,34 +1522,44 @@ -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; -ios) ;; -none) ;; + -*-eabi) + case $basic_machine in + arm*) + ;; + esac + ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1652,9 +1655,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1694,7 +1694,7 @@ m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1709,9 +1709,6 @@ i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1821,15 +1818,15 @@ vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.29.92/clutter/build/depcomp mutter-3.30.0/clutter/build/depcomp --- mutter-3.29.92/clutter/build/depcomp 2018-08-29 16:42:51.000000000 +0000 +++ mutter-3.30.0/clutter/build/depcomp 2018-09-03 22:06:37.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/clutter/build/install-sh mutter-3.30.0/clutter/build/install-sh --- mutter-3.29.92/clutter/build/install-sh 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/build/install-sh 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,8 +444,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -493,7 +510,7 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/clutter/build/Makefile.in mutter-3.30.0/clutter/build/Makefile.in --- mutter-3.29.92/clutter/build/Makefile.in 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/build/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -140,7 +140,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -401,8 +401,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -519,7 +519,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/clutter/build/missing mutter-3.30.0/clutter/build/missing --- mutter-3.29.92/clutter/build/missing 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/build/missing 2018-09-03 22:06:37.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/clutter/build/test-driver mutter-3.30.0/clutter/build/test-driver --- mutter-3.29.92/clutter/build/test-driver 2018-08-29 16:42:51.000000000 +0000 +++ mutter-3.30.0/clutter/build/test-driver 2018-09-03 22:06:37.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,7 +140,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/clutter/clutter/Makefile.in mutter-3.30.0/clutter/clutter/Makefile.in --- mutter-3.29.92/clutter/clutter/Makefile.in 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/clutter/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -519,7 +519,149 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/clutter-action.Plo \ + ./$(DEPDIR)/clutter-actor-box.Plo \ + ./$(DEPDIR)/clutter-actor-meta.Plo \ + ./$(DEPDIR)/clutter-actor.Plo \ + ./$(DEPDIR)/clutter-align-constraint.Plo \ + ./$(DEPDIR)/clutter-animatable.Plo \ + ./$(DEPDIR)/clutter-backend.Plo \ + ./$(DEPDIR)/clutter-base-types.Plo \ + ./$(DEPDIR)/clutter-bezier.Plo \ + ./$(DEPDIR)/clutter-bin-layout.Plo \ + ./$(DEPDIR)/clutter-bind-constraint.Plo \ + ./$(DEPDIR)/clutter-binding-pool.Plo \ + ./$(DEPDIR)/clutter-blur-effect.Plo \ + ./$(DEPDIR)/clutter-box-layout.Plo \ + ./$(DEPDIR)/clutter-brightness-contrast-effect.Plo \ + ./$(DEPDIR)/clutter-cairo.Plo ./$(DEPDIR)/clutter-canvas.Plo \ + ./$(DEPDIR)/clutter-child-meta.Plo \ + ./$(DEPDIR)/clutter-click-action.Plo \ + ./$(DEPDIR)/clutter-clone.Plo ./$(DEPDIR)/clutter-color.Plo \ + ./$(DEPDIR)/clutter-colorize-effect.Plo \ + ./$(DEPDIR)/clutter-constraint.Plo \ + ./$(DEPDIR)/clutter-container.Plo \ + ./$(DEPDIR)/clutter-content.Plo \ + ./$(DEPDIR)/clutter-deform-effect.Plo \ + ./$(DEPDIR)/clutter-desaturate-effect.Plo \ + ./$(DEPDIR)/clutter-device-manager.Plo \ + ./$(DEPDIR)/clutter-drag-action.Plo \ + ./$(DEPDIR)/clutter-drop-action.Plo \ + ./$(DEPDIR)/clutter-easing.Plo ./$(DEPDIR)/clutter-effect.Plo \ + ./$(DEPDIR)/clutter-enum-types.Plo \ + ./$(DEPDIR)/clutter-event-translator.Plo \ + ./$(DEPDIR)/clutter-event.Plo ./$(DEPDIR)/clutter-feature.Plo \ + ./$(DEPDIR)/clutter-fixed-layout.Plo \ + ./$(DEPDIR)/clutter-flatten-effect.Plo \ + ./$(DEPDIR)/clutter-flow-layout.Plo \ + ./$(DEPDIR)/clutter-gesture-action.Plo \ + ./$(DEPDIR)/clutter-grid-layout.Plo \ + ./$(DEPDIR)/clutter-id-pool.Plo ./$(DEPDIR)/clutter-image.Plo \ + ./$(DEPDIR)/clutter-input-device-tool.Plo \ + ./$(DEPDIR)/clutter-input-device.Plo \ + ./$(DEPDIR)/clutter-input-focus.Plo \ + ./$(DEPDIR)/clutter-input-method.Plo \ + ./$(DEPDIR)/clutter-interval.Plo \ + ./$(DEPDIR)/clutter-keyframe-transition.Plo \ + ./$(DEPDIR)/clutter-keysyms-table.Plo \ + ./$(DEPDIR)/clutter-layout-manager.Plo \ + ./$(DEPDIR)/clutter-layout-meta.Plo \ + ./$(DEPDIR)/clutter-main.Plo ./$(DEPDIR)/clutter-marshal.Plo \ + ./$(DEPDIR)/clutter-master-clock-default.Plo \ + ./$(DEPDIR)/clutter-master-clock.Plo \ + ./$(DEPDIR)/clutter-offscreen-effect.Plo \ + ./$(DEPDIR)/clutter-page-turn-effect.Plo \ + ./$(DEPDIR)/clutter-paint-node.Plo \ + ./$(DEPDIR)/clutter-paint-nodes.Plo \ + ./$(DEPDIR)/clutter-paint-volume.Plo \ + ./$(DEPDIR)/clutter-pan-action.Plo \ + ./$(DEPDIR)/clutter-path-constraint.Plo \ + ./$(DEPDIR)/clutter-path.Plo \ + ./$(DEPDIR)/clutter-property-transition.Plo \ + ./$(DEPDIR)/clutter-rotate-action.Plo \ + ./$(DEPDIR)/clutter-script-parser.Plo \ + ./$(DEPDIR)/clutter-script.Plo \ + ./$(DEPDIR)/clutter-scriptable.Plo \ + ./$(DEPDIR)/clutter-scroll-actor.Plo \ + ./$(DEPDIR)/clutter-settings.Plo \ + ./$(DEPDIR)/clutter-shader-effect.Plo \ + ./$(DEPDIR)/clutter-shader-types.Plo \ + ./$(DEPDIR)/clutter-snap-constraint.Plo \ + ./$(DEPDIR)/clutter-stage-manager.Plo \ + ./$(DEPDIR)/clutter-stage-view.Plo \ + ./$(DEPDIR)/clutter-stage-window.Plo \ + ./$(DEPDIR)/clutter-stage.Plo \ + ./$(DEPDIR)/clutter-swipe-action.Plo \ + ./$(DEPDIR)/clutter-tap-action.Plo \ + ./$(DEPDIR)/clutter-test-utils.Plo \ + ./$(DEPDIR)/clutter-text-buffer.Plo \ + ./$(DEPDIR)/clutter-text.Plo ./$(DEPDIR)/clutter-timeline.Plo \ + ./$(DEPDIR)/clutter-transition-group.Plo \ + ./$(DEPDIR)/clutter-transition.Plo \ + ./$(DEPDIR)/clutter-units.Plo ./$(DEPDIR)/clutter-util.Plo \ + ./$(DEPDIR)/clutter-virtual-input-device.Plo \ + ./$(DEPDIR)/clutter-zoom-action.Plo \ + cally/$(DEPDIR)/cally-actor.Plo \ + cally/$(DEPDIR)/cally-clone.Plo \ + cally/$(DEPDIR)/cally-group.Plo \ + cally/$(DEPDIR)/cally-rectangle.Plo \ + cally/$(DEPDIR)/cally-root.Plo cally/$(DEPDIR)/cally-stage.Plo \ + cally/$(DEPDIR)/cally-text.Plo \ + cally/$(DEPDIR)/cally-texture.Plo \ + cally/$(DEPDIR)/cally-util.Plo cally/$(DEPDIR)/cally.Plo \ + cogl/$(DEPDIR)/clutter-stage-cogl.Plo \ + deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo \ + deprecated/$(DEPDIR)/clutter-alpha.Plo \ + deprecated/$(DEPDIR)/clutter-animation.Plo \ + deprecated/$(DEPDIR)/clutter-animator.Plo \ + deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo \ + deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo \ + deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo \ + deprecated/$(DEPDIR)/clutter-behaviour-path.Plo \ + deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo \ + deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo \ + deprecated/$(DEPDIR)/clutter-behaviour.Plo \ + deprecated/$(DEPDIR)/clutter-box.Plo \ + deprecated/$(DEPDIR)/clutter-cairo-texture.Plo \ + deprecated/$(DEPDIR)/clutter-frame-source.Plo \ + deprecated/$(DEPDIR)/clutter-group.Plo \ + deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo \ + deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo \ + deprecated/$(DEPDIR)/clutter-list-model.Plo \ + deprecated/$(DEPDIR)/clutter-media.Plo \ + deprecated/$(DEPDIR)/clutter-model.Plo \ + deprecated/$(DEPDIR)/clutter-rectangle.Plo \ + deprecated/$(DEPDIR)/clutter-score.Plo \ + deprecated/$(DEPDIR)/clutter-shader.Plo \ + deprecated/$(DEPDIR)/clutter-state.Plo \ + deprecated/$(DEPDIR)/clutter-table-layout.Plo \ + deprecated/$(DEPDIR)/clutter-texture.Plo \ + deprecated/$(DEPDIR)/clutter-timeout-interval.Plo \ + deprecated/$(DEPDIR)/clutter-timeout-pool.Plo \ + egl/$(DEPDIR)/clutter-backend-eglnative.Plo \ + evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo \ + evdev/$(DEPDIR)/clutter-event-evdev.Plo \ + evdev/$(DEPDIR)/clutter-input-device-evdev.Plo \ + evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo \ + evdev/$(DEPDIR)/clutter-seat-evdev.Plo \ + evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo \ + evdev/$(DEPDIR)/clutter-xkb-utils.Plo \ + wayland/$(DEPDIR)/clutter-wayland-surface.Plo \ + x11/$(DEPDIR)/clutter-backend-x11.Plo \ + x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo \ + x11/$(DEPDIR)/clutter-device-manager-xi2.Plo \ + x11/$(DEPDIR)/clutter-event-x11.Plo \ + x11/$(DEPDIR)/clutter-input-device-core-x11.Plo \ + x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo \ + x11/$(DEPDIR)/clutter-input-device-xi2.Plo \ + x11/$(DEPDIR)/clutter-keymap-x11.Plo \ + x11/$(DEPDIR)/clutter-stage-x11.Plo \ + x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo \ + x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo \ + x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo \ + x11/xsettings/$(DEPDIR)/xsettings-client.Plo \ + x11/xsettings/$(DEPDIR)/xsettings-common.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -1441,8 +1583,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(srcdir)/Makefile.am.marshal $(srcdir)/Makefile.am.enums $(am__empty): @@ -1707,158 +1849,164 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-box.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-meta.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-align-constraint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-animatable.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-backend.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-base-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bezier.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bin-layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bind-constraint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-binding-pool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-blur-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-box-layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-brightness-contrast-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-cairo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-canvas.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-child-meta.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-click-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-clone.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-color.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-colorize-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-constraint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-container.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-content.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-deform-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-desaturate-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-device-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drag-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drop-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-easing.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-enum-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event-translator.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-feature.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-fixed-layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flatten-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flow-layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-gesture-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-grid-layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-id-pool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-image.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device-tool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-focus.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-method.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-interval.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keyframe-transition.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keysyms-table.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-meta.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-main.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-marshal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock-default.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-offscreen-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-page-turn-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-node.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-nodes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-volume.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-pan-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path-constraint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-property-transition.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-rotate-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script-parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scriptable.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scroll-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-settings.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-effect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-snap-constraint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-view.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-window.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-swipe-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-tap-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-test-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-timeline.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition-group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-units.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-virtual-input-device.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-zoom-action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-clone.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-rectangle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-root.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-stage.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-text.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@cogl/$(DEPDIR)/clutter-stage-cogl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-alpha.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animation.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animator.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-path.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-box.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-cairo-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-frame-source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-list-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-media.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-rectangle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-score.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-shader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-state.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-table-layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-interval.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-pool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@egl/$(DEPDIR)/clutter-backend-eglnative.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-event-evdev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-evdev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-seat-evdev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-xkb-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/clutter-wayland-surface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-backend-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-xi2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-event-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-core-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-xi2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-keymap-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-stage-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-client.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-box.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-meta.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-align-constraint.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-animatable.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-backend.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-base-types.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bezier.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bin-layout.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bind-constraint.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-binding-pool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-blur-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-box-layout.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-brightness-contrast-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-cairo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-canvas.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-child-meta.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-click-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-clone.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-color.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-colorize-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-constraint.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-container.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-content.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-deform-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-desaturate-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-device-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drag-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drop-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-easing.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-enum-types.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event-translator.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-feature.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-fixed-layout.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flatten-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flow-layout.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-gesture-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-grid-layout.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-id-pool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-image.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device-tool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-focus.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-method.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-interval.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keyframe-transition.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keysyms-table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-meta.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-main.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-marshal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock-default.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-offscreen-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-page-turn-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-node.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-nodes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-volume.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-pan-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path-constraint.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-property-transition.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-rotate-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script-parser.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scriptable.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scroll-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-settings.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-effect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-types.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-snap-constraint.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-view.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-window.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-swipe-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-tap-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-test-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-timeline.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition-group.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-units.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-virtual-input-device.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-zoom-action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-clone.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-group.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-rectangle.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-root.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-stage.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-text.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@cogl/$(DEPDIR)/clutter-stage-cogl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-alpha.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animation.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animator.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-path.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-box.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-cairo-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-frame-source.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-group.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-list-model.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-media.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-model.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-rectangle.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-score.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-shader.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-state.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-table-layout.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-interval.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-pool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@egl/$(DEPDIR)/clutter-backend-eglnative.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-event-evdev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-evdev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-seat-evdev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-xkb-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/clutter-wayland-surface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-backend-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-xi2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-event-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-core-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-xi2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-keymap-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-stage-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-client.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-common.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -2181,7 +2329,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2276,7 +2427,158 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) cally/$(DEPDIR) cogl/$(DEPDIR) deprecated/$(DEPDIR) egl/$(DEPDIR) evdev/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) x11/xsettings/$(DEPDIR) + -rm -f ./$(DEPDIR)/clutter-action.Plo + -rm -f ./$(DEPDIR)/clutter-actor-box.Plo + -rm -f ./$(DEPDIR)/clutter-actor-meta.Plo + -rm -f ./$(DEPDIR)/clutter-actor.Plo + -rm -f ./$(DEPDIR)/clutter-align-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-animatable.Plo + -rm -f ./$(DEPDIR)/clutter-backend.Plo + -rm -f ./$(DEPDIR)/clutter-base-types.Plo + -rm -f ./$(DEPDIR)/clutter-bezier.Plo + -rm -f ./$(DEPDIR)/clutter-bin-layout.Plo + -rm -f ./$(DEPDIR)/clutter-bind-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-binding-pool.Plo + -rm -f ./$(DEPDIR)/clutter-blur-effect.Plo + -rm -f ./$(DEPDIR)/clutter-box-layout.Plo + -rm -f ./$(DEPDIR)/clutter-brightness-contrast-effect.Plo + -rm -f ./$(DEPDIR)/clutter-cairo.Plo + -rm -f ./$(DEPDIR)/clutter-canvas.Plo + -rm -f ./$(DEPDIR)/clutter-child-meta.Plo + -rm -f ./$(DEPDIR)/clutter-click-action.Plo + -rm -f ./$(DEPDIR)/clutter-clone.Plo + -rm -f ./$(DEPDIR)/clutter-color.Plo + -rm -f ./$(DEPDIR)/clutter-colorize-effect.Plo + -rm -f ./$(DEPDIR)/clutter-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-container.Plo + -rm -f ./$(DEPDIR)/clutter-content.Plo + -rm -f ./$(DEPDIR)/clutter-deform-effect.Plo + -rm -f ./$(DEPDIR)/clutter-desaturate-effect.Plo + -rm -f ./$(DEPDIR)/clutter-device-manager.Plo + -rm -f ./$(DEPDIR)/clutter-drag-action.Plo + -rm -f ./$(DEPDIR)/clutter-drop-action.Plo + -rm -f ./$(DEPDIR)/clutter-easing.Plo + -rm -f ./$(DEPDIR)/clutter-effect.Plo + -rm -f ./$(DEPDIR)/clutter-enum-types.Plo + -rm -f ./$(DEPDIR)/clutter-event-translator.Plo + -rm -f ./$(DEPDIR)/clutter-event.Plo + -rm -f ./$(DEPDIR)/clutter-feature.Plo + -rm -f ./$(DEPDIR)/clutter-fixed-layout.Plo + -rm -f ./$(DEPDIR)/clutter-flatten-effect.Plo + -rm -f ./$(DEPDIR)/clutter-flow-layout.Plo + -rm -f ./$(DEPDIR)/clutter-gesture-action.Plo + -rm -f ./$(DEPDIR)/clutter-grid-layout.Plo + -rm -f ./$(DEPDIR)/clutter-id-pool.Plo + -rm -f ./$(DEPDIR)/clutter-image.Plo + -rm -f ./$(DEPDIR)/clutter-input-device-tool.Plo + -rm -f ./$(DEPDIR)/clutter-input-device.Plo + -rm -f ./$(DEPDIR)/clutter-input-focus.Plo + -rm -f ./$(DEPDIR)/clutter-input-method.Plo + -rm -f ./$(DEPDIR)/clutter-interval.Plo + -rm -f ./$(DEPDIR)/clutter-keyframe-transition.Plo + -rm -f ./$(DEPDIR)/clutter-keysyms-table.Plo + -rm -f ./$(DEPDIR)/clutter-layout-manager.Plo + -rm -f ./$(DEPDIR)/clutter-layout-meta.Plo + -rm -f ./$(DEPDIR)/clutter-main.Plo + -rm -f ./$(DEPDIR)/clutter-marshal.Plo + -rm -f ./$(DEPDIR)/clutter-master-clock-default.Plo + -rm -f ./$(DEPDIR)/clutter-master-clock.Plo + -rm -f ./$(DEPDIR)/clutter-offscreen-effect.Plo + -rm -f ./$(DEPDIR)/clutter-page-turn-effect.Plo + -rm -f ./$(DEPDIR)/clutter-paint-node.Plo + -rm -f ./$(DEPDIR)/clutter-paint-nodes.Plo + -rm -f ./$(DEPDIR)/clutter-paint-volume.Plo + -rm -f ./$(DEPDIR)/clutter-pan-action.Plo + -rm -f ./$(DEPDIR)/clutter-path-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-path.Plo + -rm -f ./$(DEPDIR)/clutter-property-transition.Plo + -rm -f ./$(DEPDIR)/clutter-rotate-action.Plo + -rm -f ./$(DEPDIR)/clutter-script-parser.Plo + -rm -f ./$(DEPDIR)/clutter-script.Plo + -rm -f ./$(DEPDIR)/clutter-scriptable.Plo + -rm -f ./$(DEPDIR)/clutter-scroll-actor.Plo + -rm -f ./$(DEPDIR)/clutter-settings.Plo + -rm -f ./$(DEPDIR)/clutter-shader-effect.Plo + -rm -f ./$(DEPDIR)/clutter-shader-types.Plo + -rm -f ./$(DEPDIR)/clutter-snap-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-stage-manager.Plo + -rm -f ./$(DEPDIR)/clutter-stage-view.Plo + -rm -f ./$(DEPDIR)/clutter-stage-window.Plo + -rm -f ./$(DEPDIR)/clutter-stage.Plo + -rm -f ./$(DEPDIR)/clutter-swipe-action.Plo + -rm -f ./$(DEPDIR)/clutter-tap-action.Plo + -rm -f ./$(DEPDIR)/clutter-test-utils.Plo + -rm -f ./$(DEPDIR)/clutter-text-buffer.Plo + -rm -f ./$(DEPDIR)/clutter-text.Plo + -rm -f ./$(DEPDIR)/clutter-timeline.Plo + -rm -f ./$(DEPDIR)/clutter-transition-group.Plo + -rm -f ./$(DEPDIR)/clutter-transition.Plo + -rm -f ./$(DEPDIR)/clutter-units.Plo + -rm -f ./$(DEPDIR)/clutter-util.Plo + -rm -f ./$(DEPDIR)/clutter-virtual-input-device.Plo + -rm -f ./$(DEPDIR)/clutter-zoom-action.Plo + -rm -f cally/$(DEPDIR)/cally-actor.Plo + -rm -f cally/$(DEPDIR)/cally-clone.Plo + -rm -f cally/$(DEPDIR)/cally-group.Plo + -rm -f cally/$(DEPDIR)/cally-rectangle.Plo + -rm -f cally/$(DEPDIR)/cally-root.Plo + -rm -f cally/$(DEPDIR)/cally-stage.Plo + -rm -f cally/$(DEPDIR)/cally-text.Plo + -rm -f cally/$(DEPDIR)/cally-texture.Plo + -rm -f cally/$(DEPDIR)/cally-util.Plo + -rm -f cally/$(DEPDIR)/cally.Plo + -rm -f cogl/$(DEPDIR)/clutter-stage-cogl.Plo + -rm -f deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/clutter-alpha.Plo + -rm -f deprecated/$(DEPDIR)/clutter-animation.Plo + -rm -f deprecated/$(DEPDIR)/clutter-animator.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-path.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour.Plo + -rm -f deprecated/$(DEPDIR)/clutter-box.Plo + -rm -f deprecated/$(DEPDIR)/clutter-cairo-texture.Plo + -rm -f deprecated/$(DEPDIR)/clutter-frame-source.Plo + -rm -f deprecated/$(DEPDIR)/clutter-group.Plo + -rm -f deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/clutter-list-model.Plo + -rm -f deprecated/$(DEPDIR)/clutter-media.Plo + -rm -f deprecated/$(DEPDIR)/clutter-model.Plo + -rm -f deprecated/$(DEPDIR)/clutter-rectangle.Plo + -rm -f deprecated/$(DEPDIR)/clutter-score.Plo + -rm -f deprecated/$(DEPDIR)/clutter-shader.Plo + -rm -f deprecated/$(DEPDIR)/clutter-state.Plo + -rm -f deprecated/$(DEPDIR)/clutter-table-layout.Plo + -rm -f deprecated/$(DEPDIR)/clutter-texture.Plo + -rm -f deprecated/$(DEPDIR)/clutter-timeout-interval.Plo + -rm -f deprecated/$(DEPDIR)/clutter-timeout-pool.Plo + -rm -f egl/$(DEPDIR)/clutter-backend-eglnative.Plo + -rm -f evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-event-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-input-device-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-seat-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-xkb-utils.Plo + -rm -f wayland/$(DEPDIR)/clutter-wayland-surface.Plo + -rm -f x11/$(DEPDIR)/clutter-backend-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-device-manager-xi2.Plo + -rm -f x11/$(DEPDIR)/clutter-event-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-input-device-core-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo + -rm -f x11/$(DEPDIR)/clutter-input-device-xi2.Plo + -rm -f x11/$(DEPDIR)/clutter-keymap-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-stage-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo + -rm -f x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo + -rm -f x11/xsettings/$(DEPDIR)/xsettings-client.Plo + -rm -f x11/xsettings/$(DEPDIR)/xsettings-common.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -2330,7 +2632,158 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) cally/$(DEPDIR) cogl/$(DEPDIR) deprecated/$(DEPDIR) egl/$(DEPDIR) evdev/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) x11/xsettings/$(DEPDIR) + -rm -f ./$(DEPDIR)/clutter-action.Plo + -rm -f ./$(DEPDIR)/clutter-actor-box.Plo + -rm -f ./$(DEPDIR)/clutter-actor-meta.Plo + -rm -f ./$(DEPDIR)/clutter-actor.Plo + -rm -f ./$(DEPDIR)/clutter-align-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-animatable.Plo + -rm -f ./$(DEPDIR)/clutter-backend.Plo + -rm -f ./$(DEPDIR)/clutter-base-types.Plo + -rm -f ./$(DEPDIR)/clutter-bezier.Plo + -rm -f ./$(DEPDIR)/clutter-bin-layout.Plo + -rm -f ./$(DEPDIR)/clutter-bind-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-binding-pool.Plo + -rm -f ./$(DEPDIR)/clutter-blur-effect.Plo + -rm -f ./$(DEPDIR)/clutter-box-layout.Plo + -rm -f ./$(DEPDIR)/clutter-brightness-contrast-effect.Plo + -rm -f ./$(DEPDIR)/clutter-cairo.Plo + -rm -f ./$(DEPDIR)/clutter-canvas.Plo + -rm -f ./$(DEPDIR)/clutter-child-meta.Plo + -rm -f ./$(DEPDIR)/clutter-click-action.Plo + -rm -f ./$(DEPDIR)/clutter-clone.Plo + -rm -f ./$(DEPDIR)/clutter-color.Plo + -rm -f ./$(DEPDIR)/clutter-colorize-effect.Plo + -rm -f ./$(DEPDIR)/clutter-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-container.Plo + -rm -f ./$(DEPDIR)/clutter-content.Plo + -rm -f ./$(DEPDIR)/clutter-deform-effect.Plo + -rm -f ./$(DEPDIR)/clutter-desaturate-effect.Plo + -rm -f ./$(DEPDIR)/clutter-device-manager.Plo + -rm -f ./$(DEPDIR)/clutter-drag-action.Plo + -rm -f ./$(DEPDIR)/clutter-drop-action.Plo + -rm -f ./$(DEPDIR)/clutter-easing.Plo + -rm -f ./$(DEPDIR)/clutter-effect.Plo + -rm -f ./$(DEPDIR)/clutter-enum-types.Plo + -rm -f ./$(DEPDIR)/clutter-event-translator.Plo + -rm -f ./$(DEPDIR)/clutter-event.Plo + -rm -f ./$(DEPDIR)/clutter-feature.Plo + -rm -f ./$(DEPDIR)/clutter-fixed-layout.Plo + -rm -f ./$(DEPDIR)/clutter-flatten-effect.Plo + -rm -f ./$(DEPDIR)/clutter-flow-layout.Plo + -rm -f ./$(DEPDIR)/clutter-gesture-action.Plo + -rm -f ./$(DEPDIR)/clutter-grid-layout.Plo + -rm -f ./$(DEPDIR)/clutter-id-pool.Plo + -rm -f ./$(DEPDIR)/clutter-image.Plo + -rm -f ./$(DEPDIR)/clutter-input-device-tool.Plo + -rm -f ./$(DEPDIR)/clutter-input-device.Plo + -rm -f ./$(DEPDIR)/clutter-input-focus.Plo + -rm -f ./$(DEPDIR)/clutter-input-method.Plo + -rm -f ./$(DEPDIR)/clutter-interval.Plo + -rm -f ./$(DEPDIR)/clutter-keyframe-transition.Plo + -rm -f ./$(DEPDIR)/clutter-keysyms-table.Plo + -rm -f ./$(DEPDIR)/clutter-layout-manager.Plo + -rm -f ./$(DEPDIR)/clutter-layout-meta.Plo + -rm -f ./$(DEPDIR)/clutter-main.Plo + -rm -f ./$(DEPDIR)/clutter-marshal.Plo + -rm -f ./$(DEPDIR)/clutter-master-clock-default.Plo + -rm -f ./$(DEPDIR)/clutter-master-clock.Plo + -rm -f ./$(DEPDIR)/clutter-offscreen-effect.Plo + -rm -f ./$(DEPDIR)/clutter-page-turn-effect.Plo + -rm -f ./$(DEPDIR)/clutter-paint-node.Plo + -rm -f ./$(DEPDIR)/clutter-paint-nodes.Plo + -rm -f ./$(DEPDIR)/clutter-paint-volume.Plo + -rm -f ./$(DEPDIR)/clutter-pan-action.Plo + -rm -f ./$(DEPDIR)/clutter-path-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-path.Plo + -rm -f ./$(DEPDIR)/clutter-property-transition.Plo + -rm -f ./$(DEPDIR)/clutter-rotate-action.Plo + -rm -f ./$(DEPDIR)/clutter-script-parser.Plo + -rm -f ./$(DEPDIR)/clutter-script.Plo + -rm -f ./$(DEPDIR)/clutter-scriptable.Plo + -rm -f ./$(DEPDIR)/clutter-scroll-actor.Plo + -rm -f ./$(DEPDIR)/clutter-settings.Plo + -rm -f ./$(DEPDIR)/clutter-shader-effect.Plo + -rm -f ./$(DEPDIR)/clutter-shader-types.Plo + -rm -f ./$(DEPDIR)/clutter-snap-constraint.Plo + -rm -f ./$(DEPDIR)/clutter-stage-manager.Plo + -rm -f ./$(DEPDIR)/clutter-stage-view.Plo + -rm -f ./$(DEPDIR)/clutter-stage-window.Plo + -rm -f ./$(DEPDIR)/clutter-stage.Plo + -rm -f ./$(DEPDIR)/clutter-swipe-action.Plo + -rm -f ./$(DEPDIR)/clutter-tap-action.Plo + -rm -f ./$(DEPDIR)/clutter-test-utils.Plo + -rm -f ./$(DEPDIR)/clutter-text-buffer.Plo + -rm -f ./$(DEPDIR)/clutter-text.Plo + -rm -f ./$(DEPDIR)/clutter-timeline.Plo + -rm -f ./$(DEPDIR)/clutter-transition-group.Plo + -rm -f ./$(DEPDIR)/clutter-transition.Plo + -rm -f ./$(DEPDIR)/clutter-units.Plo + -rm -f ./$(DEPDIR)/clutter-util.Plo + -rm -f ./$(DEPDIR)/clutter-virtual-input-device.Plo + -rm -f ./$(DEPDIR)/clutter-zoom-action.Plo + -rm -f cally/$(DEPDIR)/cally-actor.Plo + -rm -f cally/$(DEPDIR)/cally-clone.Plo + -rm -f cally/$(DEPDIR)/cally-group.Plo + -rm -f cally/$(DEPDIR)/cally-rectangle.Plo + -rm -f cally/$(DEPDIR)/cally-root.Plo + -rm -f cally/$(DEPDIR)/cally-stage.Plo + -rm -f cally/$(DEPDIR)/cally-text.Plo + -rm -f cally/$(DEPDIR)/cally-texture.Plo + -rm -f cally/$(DEPDIR)/cally-util.Plo + -rm -f cally/$(DEPDIR)/cally.Plo + -rm -f cogl/$(DEPDIR)/clutter-stage-cogl.Plo + -rm -f deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/clutter-alpha.Plo + -rm -f deprecated/$(DEPDIR)/clutter-animation.Plo + -rm -f deprecated/$(DEPDIR)/clutter-animator.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-path.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo + -rm -f deprecated/$(DEPDIR)/clutter-behaviour.Plo + -rm -f deprecated/$(DEPDIR)/clutter-box.Plo + -rm -f deprecated/$(DEPDIR)/clutter-cairo-texture.Plo + -rm -f deprecated/$(DEPDIR)/clutter-frame-source.Plo + -rm -f deprecated/$(DEPDIR)/clutter-group.Plo + -rm -f deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/clutter-list-model.Plo + -rm -f deprecated/$(DEPDIR)/clutter-media.Plo + -rm -f deprecated/$(DEPDIR)/clutter-model.Plo + -rm -f deprecated/$(DEPDIR)/clutter-rectangle.Plo + -rm -f deprecated/$(DEPDIR)/clutter-score.Plo + -rm -f deprecated/$(DEPDIR)/clutter-shader.Plo + -rm -f deprecated/$(DEPDIR)/clutter-state.Plo + -rm -f deprecated/$(DEPDIR)/clutter-table-layout.Plo + -rm -f deprecated/$(DEPDIR)/clutter-texture.Plo + -rm -f deprecated/$(DEPDIR)/clutter-timeout-interval.Plo + -rm -f deprecated/$(DEPDIR)/clutter-timeout-pool.Plo + -rm -f egl/$(DEPDIR)/clutter-backend-eglnative.Plo + -rm -f evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-event-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-input-device-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-seat-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo + -rm -f evdev/$(DEPDIR)/clutter-xkb-utils.Plo + -rm -f wayland/$(DEPDIR)/clutter-wayland-surface.Plo + -rm -f x11/$(DEPDIR)/clutter-backend-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-device-manager-xi2.Plo + -rm -f x11/$(DEPDIR)/clutter-event-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-input-device-core-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo + -rm -f x11/$(DEPDIR)/clutter-input-device-xi2.Plo + -rm -f x11/$(DEPDIR)/clutter-keymap-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-stage-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo + -rm -f x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo + -rm -f x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo + -rm -f x11/xsettings/$(DEPDIR)/xsettings-client.Plo + -rm -f x11/xsettings/$(DEPDIR)/xsettings-common.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2360,12 +2813,13 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-cally_includeHEADERS install-clutter_deprecatedHEADERS \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-cally_includeHEADERS \ + install-clutter_deprecatedHEADERS \ install-clutter_includeHEADERS \ install-clutteregl_includeHEADERS \ install-clutterevdev_includeHEADERS \ diff -Nru mutter-3.29.92/clutter/configure mutter-3.30.0/clutter/configure --- mutter-3.29.92/clutter/configure 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/configure 2018-09-03 22:06:36.000000000 +0000 @@ -749,7 +749,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -843,7 +842,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -2484,7 +2484,7 @@ -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2991,8 +2991,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3159,7 +3159,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3485,45 +3485,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -15967,7 +15967,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -16877,29 +16877,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -16917,53 +16923,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) diff -Nru mutter-3.29.92/clutter/examples/Makefile.in mutter-3.30.0/clutter/examples/Makefile.in --- mutter-3.29.92/clutter/examples/Makefile.in 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/examples/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -243,7 +243,16 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/actor-model.Po \ + ./$(DEPDIR)/basic-actor.Po ./$(DEPDIR)/bin-layout.Po \ + ./$(DEPDIR)/box-layout.Po ./$(DEPDIR)/canvas.Po \ + ./$(DEPDIR)/constraints.Po ./$(DEPDIR)/drag-action.Po \ + ./$(DEPDIR)/drop-action.Po ./$(DEPDIR)/easing-modes.Po \ + ./$(DEPDIR)/flow-layout.Po ./$(DEPDIR)/grid-layout.Po \ + ./$(DEPDIR)/image-content.Po ./$(DEPDIR)/layout-manager.Po \ + ./$(DEPDIR)/pan-action.Po ./$(DEPDIR)/rounded-rectangle.Po \ + ./$(DEPDIR)/scroll-actor.Po ./$(DEPDIR)/threads.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -527,8 +536,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -623,23 +632,29 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-model.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic-actor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bin-layout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box-layout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canvas.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraints.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drag-action.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drop-action.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/easing-modes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flow-layout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid-layout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-content.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout-manager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pan-action.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rounded-rectangle.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scroll-actor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-model.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic-actor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bin-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canvas.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraints.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drag-action.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drop-action.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/easing-modes.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flow-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-content.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout-manager.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pan-action.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rounded-rectangle.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scroll-actor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -720,7 +735,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -790,7 +808,23 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/actor-model.Po + -rm -f ./$(DEPDIR)/basic-actor.Po + -rm -f ./$(DEPDIR)/bin-layout.Po + -rm -f ./$(DEPDIR)/box-layout.Po + -rm -f ./$(DEPDIR)/canvas.Po + -rm -f ./$(DEPDIR)/constraints.Po + -rm -f ./$(DEPDIR)/drag-action.Po + -rm -f ./$(DEPDIR)/drop-action.Po + -rm -f ./$(DEPDIR)/easing-modes.Po + -rm -f ./$(DEPDIR)/flow-layout.Po + -rm -f ./$(DEPDIR)/grid-layout.Po + -rm -f ./$(DEPDIR)/image-content.Po + -rm -f ./$(DEPDIR)/layout-manager.Po + -rm -f ./$(DEPDIR)/pan-action.Po + -rm -f ./$(DEPDIR)/rounded-rectangle.Po + -rm -f ./$(DEPDIR)/scroll-actor.Po + -rm -f ./$(DEPDIR)/threads.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -836,7 +870,23 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/actor-model.Po + -rm -f ./$(DEPDIR)/basic-actor.Po + -rm -f ./$(DEPDIR)/bin-layout.Po + -rm -f ./$(DEPDIR)/box-layout.Po + -rm -f ./$(DEPDIR)/canvas.Po + -rm -f ./$(DEPDIR)/constraints.Po + -rm -f ./$(DEPDIR)/drag-action.Po + -rm -f ./$(DEPDIR)/drop-action.Po + -rm -f ./$(DEPDIR)/easing-modes.Po + -rm -f ./$(DEPDIR)/flow-layout.Po + -rm -f ./$(DEPDIR)/grid-layout.Po + -rm -f ./$(DEPDIR)/image-content.Po + -rm -f ./$(DEPDIR)/layout-manager.Po + -rm -f ./$(DEPDIR)/pan-action.Po + -rm -f ./$(DEPDIR)/rounded-rectangle.Po + -rm -f ./$(DEPDIR)/scroll-actor.Po + -rm -f ./$(DEPDIR)/threads.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -857,9 +907,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff -Nru mutter-3.29.92/clutter/Makefile.in mutter-3.30.0/clutter/Makefile.in --- mutter-3.29.92/clutter/Makefile.in 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -144,7 +144,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -437,8 +437,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -565,7 +565,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru mutter-3.29.92/clutter/tests/accessibility/Makefile.in mutter-3.30.0/clutter/tests/accessibility/Makefile.in --- mutter-3.29.92/clutter/tests/accessibility/Makefile.in 2018-08-29 16:42:51.000000000 +0000 +++ mutter-3.30.0/clutter/tests/accessibility/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,7 +163,13 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/cally-atkcomponent-example.Po \ + ./$(DEPDIR)/cally-atkeditabletext-example.Po \ + ./$(DEPDIR)/cally-atkevents-example.Po \ + ./$(DEPDIR)/cally-atktext-example.Po \ + ./$(DEPDIR)/cally-clone-example.Po \ + ./$(DEPDIR)/cally-examples-util.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -459,8 +465,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -507,12 +513,18 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkcomponent-example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkeditabletext-example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkevents-example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atktext-example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-clone-example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-examples-util.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkcomponent-example.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkeditabletext-example.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkevents-example.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atktext-example.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-clone-example.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-examples-util.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -593,7 +605,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -665,7 +680,12 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/cally-atkcomponent-example.Po + -rm -f ./$(DEPDIR)/cally-atkeditabletext-example.Po + -rm -f ./$(DEPDIR)/cally-atkevents-example.Po + -rm -f ./$(DEPDIR)/cally-atktext-example.Po + -rm -f ./$(DEPDIR)/cally-clone-example.Po + -rm -f ./$(DEPDIR)/cally-examples-util.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -711,7 +731,12 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/cally-atkcomponent-example.Po + -rm -f ./$(DEPDIR)/cally-atkeditabletext-example.Po + -rm -f ./$(DEPDIR)/cally-atkevents-example.Po + -rm -f ./$(DEPDIR)/cally-atktext-example.Po + -rm -f ./$(DEPDIR)/cally-clone-example.Po + -rm -f ./$(DEPDIR)/cally-examples-util.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -732,7 +757,7 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.29.92/clutter/tests/conform/Makefile.in mutter-3.30.0/clutter/tests/conform/Makefile.in --- mutter-3.29.92/clutter/tests/conform/Makefile.in 2018-08-29 16:42:51.000000000 +0000 +++ mutter-3.30.0/clutter/tests/conform/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,6 +141,32 @@ CONFIG_HEADER = $(top_builddir)/clutter/clutter-build-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__EXEEXT_1 = +am__EXEEXT_2 = actor-anchors$(EXEEXT) actor-destroy$(EXEEXT) \ + actor-graph$(EXEEXT) actor-invariants$(EXEEXT) \ + actor-iter$(EXEEXT) actor-layout$(EXEEXT) actor-meta$(EXEEXT) \ + actor-offscreen-limit-max-size$(EXEEXT) \ + actor-offscreen-redirect$(EXEEXT) actor-paint-opacity$(EXEEXT) \ + actor-pick$(EXEEXT) actor-shader-effect$(EXEEXT) \ + actor-size$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_3 = binding-pool$(EXEEXT) color$(EXEEXT) \ + events-touch$(EXEEXT) interval$(EXEEXT) model$(EXEEXT) \ + script-parser$(EXEEXT) units$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_4 = text$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_5 = animator$(EXEEXT) behaviours$(EXEEXT) group$(EXEEXT) \ + rectangle$(EXEEXT) texture$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_6 = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ + $(am__EXEEXT_5) +am__EXEEXT_7 = $(am__EXEEXT_6) +@ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_8 = $(am__EXEEXT_7) +@ENABLE_INSTALLED_TESTS_TRUE@am__EXEEXT_9 = $(am__EXEEXT_6) +am__installdirs = "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_test_metadir)" \ + "$(DESTDIR)$(installed_testdir)" +@ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_10 = $(am__EXEEXT_7) +PROGRAMS = $(installed_test_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -168,33 +194,7 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(installed_testdir)" \ - "$(DESTDIR)$(installed_testdir)" \ - "$(DESTDIR)$(installed_testdir)" \ - "$(DESTDIR)$(installed_test_metadir)" \ - "$(DESTDIR)$(installed_testdir)" LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_LTLIBRARIES) -am__EXEEXT_1 = -am__EXEEXT_2 = actor-anchors$(EXEEXT) actor-destroy$(EXEEXT) \ - actor-graph$(EXEEXT) actor-invariants$(EXEEXT) \ - actor-iter$(EXEEXT) actor-layout$(EXEEXT) actor-meta$(EXEEXT) \ - actor-offscreen-limit-max-size$(EXEEXT) \ - actor-offscreen-redirect$(EXEEXT) actor-paint-opacity$(EXEEXT) \ - actor-pick$(EXEEXT) actor-shader-effect$(EXEEXT) \ - actor-size$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_3 = binding-pool$(EXEEXT) color$(EXEEXT) \ - events-touch$(EXEEXT) interval$(EXEEXT) model$(EXEEXT) \ - script-parser$(EXEEXT) units$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_4 = text$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_5 = animator$(EXEEXT) behaviours$(EXEEXT) group$(EXEEXT) \ - rectangle$(EXEEXT) texture$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_6 = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ - $(am__EXEEXT_5) -am__EXEEXT_7 = $(am__EXEEXT_6) -@ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_8 = $(am__EXEEXT_7) -@ENABLE_INSTALLED_TESTS_TRUE@am__EXEEXT_9 = $(am__EXEEXT_6) -@ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_10 = $(am__EXEEXT_7) -PROGRAMS = $(installed_test_PROGRAMS) $(noinst_PROGRAMS) actor_anchors_SOURCES = actor-anchors.c actor_anchors_OBJECTS = actor-anchors.$(OBJEXT) actor_anchors_LDADD = $(LDADD) @@ -373,7 +373,22 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/actor-anchors.Po \ + ./$(DEPDIR)/actor-destroy.Po ./$(DEPDIR)/actor-graph.Po \ + ./$(DEPDIR)/actor-invariants.Po ./$(DEPDIR)/actor-iter.Po \ + ./$(DEPDIR)/actor-layout.Po ./$(DEPDIR)/actor-meta.Po \ + ./$(DEPDIR)/actor-offscreen-limit-max-size.Po \ + ./$(DEPDIR)/actor-offscreen-redirect.Po \ + ./$(DEPDIR)/actor-paint-opacity.Po ./$(DEPDIR)/actor-pick.Po \ + ./$(DEPDIR)/actor-shader-effect.Po ./$(DEPDIR)/actor-size.Po \ + ./$(DEPDIR)/animator.Po ./$(DEPDIR)/behaviours.Po \ + ./$(DEPDIR)/binding-pool.Po ./$(DEPDIR)/color.Po \ + ./$(DEPDIR)/events-touch.Po ./$(DEPDIR)/group.Po \ + ./$(DEPDIR)/interval.Po ./$(DEPDIR)/model.Po \ + ./$(DEPDIR)/rectangle.Po ./$(DEPDIR)/script-parser.Po \ + ./$(DEPDIR)/text.Po ./$(DEPDIR)/texture.Po \ + ./$(DEPDIR)/units.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -955,8 +970,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/build/autotools/glib-tap.mk $(am__empty): @@ -969,63 +984,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -clean-checkLTLIBRARIES: - -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) - @list='$(check_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -install-installed_testLTLIBRARIES: $(installed_test_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(installed_testdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(installed_testdir)"; \ - } - -uninstall-installed_testLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(installed_testdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(installed_testdir)/$$f"; \ - done - -clean-installed_testLTLIBRARIES: - -test -z "$(installed_test_LTLIBRARIES)" || rm -f $(installed_test_LTLIBRARIES) - @list='$(installed_test_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -1093,6 +1051,63 @@ echo " rm -f" $$list; \ rm -f $$list +clean-checkLTLIBRARIES: + -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) + @list='$(check_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +install-installed_testLTLIBRARIES: $(installed_test_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(installed_testdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(installed_testdir)"; \ + } + +uninstall-installed_testLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(installed_testdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(installed_testdir)/$$f"; \ + done + +clean-installed_testLTLIBRARIES: + -test -z "$(installed_test_LTLIBRARIES)" || rm -f $(installed_test_LTLIBRARIES) + @list='$(installed_test_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + actor-anchors$(EXEEXT): $(actor_anchors_OBJECTS) $(actor_anchors_DEPENDENCIES) $(EXTRA_actor_anchors_DEPENDENCIES) @rm -f actor-anchors$(EXEEXT) $(AM_V_CCLD)$(LINK) $(actor_anchors_OBJECTS) $(actor_anchors_LDADD) $(LIBS) @@ -1238,32 +1253,38 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-anchors.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-destroy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-graph.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-invariants.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-iter.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-layout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-meta.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-limit-max-size.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-redirect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-paint-opacity.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-pick.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-shader-effect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-size.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animator.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/behaviours.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binding-pool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/events-touch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script-parser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/units.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-anchors.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-destroy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-graph.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-invariants.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-iter.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-meta.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-limit-max-size.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-redirect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-paint-opacity.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-pick.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-shader-effect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-size.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animator.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/behaviours.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binding-pool.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/events-touch.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interval.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script-parser.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/units.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1509,7 +1530,7 @@ fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_SCRIPTS) $(check_DATA) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1519,7 +1540,7 @@ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ exit $$?; -recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_SCRIPTS) $(check_DATA) +recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_SCRIPTS) $(check_DATA) @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @set +e; $(am__set_TESTS_bases); \ bases=`for i in $$bases; do echo $$i; done \ @@ -1727,7 +1748,10 @@ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1758,12 +1782,12 @@ fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \ + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) \ $(check_SCRIPTS) $(check_DATA) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) installdirs: for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -1814,7 +1838,32 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/actor-anchors.Po + -rm -f ./$(DEPDIR)/actor-destroy.Po + -rm -f ./$(DEPDIR)/actor-graph.Po + -rm -f ./$(DEPDIR)/actor-invariants.Po + -rm -f ./$(DEPDIR)/actor-iter.Po + -rm -f ./$(DEPDIR)/actor-layout.Po + -rm -f ./$(DEPDIR)/actor-meta.Po + -rm -f ./$(DEPDIR)/actor-offscreen-limit-max-size.Po + -rm -f ./$(DEPDIR)/actor-offscreen-redirect.Po + -rm -f ./$(DEPDIR)/actor-paint-opacity.Po + -rm -f ./$(DEPDIR)/actor-pick.Po + -rm -f ./$(DEPDIR)/actor-shader-effect.Po + -rm -f ./$(DEPDIR)/actor-size.Po + -rm -f ./$(DEPDIR)/animator.Po + -rm -f ./$(DEPDIR)/behaviours.Po + -rm -f ./$(DEPDIR)/binding-pool.Po + -rm -f ./$(DEPDIR)/color.Po + -rm -f ./$(DEPDIR)/events-touch.Po + -rm -f ./$(DEPDIR)/group.Po + -rm -f ./$(DEPDIR)/interval.Po + -rm -f ./$(DEPDIR)/model.Po + -rm -f ./$(DEPDIR)/rectangle.Po + -rm -f ./$(DEPDIR)/script-parser.Po + -rm -f ./$(DEPDIR)/text.Po + -rm -f ./$(DEPDIR)/texture.Po + -rm -f ./$(DEPDIR)/units.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1863,7 +1912,32 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/actor-anchors.Po + -rm -f ./$(DEPDIR)/actor-destroy.Po + -rm -f ./$(DEPDIR)/actor-graph.Po + -rm -f ./$(DEPDIR)/actor-invariants.Po + -rm -f ./$(DEPDIR)/actor-iter.Po + -rm -f ./$(DEPDIR)/actor-layout.Po + -rm -f ./$(DEPDIR)/actor-meta.Po + -rm -f ./$(DEPDIR)/actor-offscreen-limit-max-size.Po + -rm -f ./$(DEPDIR)/actor-offscreen-redirect.Po + -rm -f ./$(DEPDIR)/actor-paint-opacity.Po + -rm -f ./$(DEPDIR)/actor-pick.Po + -rm -f ./$(DEPDIR)/actor-shader-effect.Po + -rm -f ./$(DEPDIR)/actor-size.Po + -rm -f ./$(DEPDIR)/animator.Po + -rm -f ./$(DEPDIR)/behaviours.Po + -rm -f ./$(DEPDIR)/binding-pool.Po + -rm -f ./$(DEPDIR)/color.Po + -rm -f ./$(DEPDIR)/events-touch.Po + -rm -f ./$(DEPDIR)/group.Po + -rm -f ./$(DEPDIR)/interval.Po + -rm -f ./$(DEPDIR)/model.Po + -rm -f ./$(DEPDIR)/rectangle.Po + -rm -f ./$(DEPDIR)/script-parser.Po + -rm -f ./$(DEPDIR)/text.Po + -rm -f ./$(DEPDIR)/texture.Po + -rm -f ./$(DEPDIR)/units.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1888,16 +1962,17 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ - clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \ - clean-installed_testLTLIBRARIES clean-installed_testPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-installed_testLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-checkLTLIBRARIES clean-checkPROGRAMS \ + clean-generic clean-installed_testLTLIBRARIES \ + clean-installed_testPROGRAMS clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-installed_testLTLIBRARIES \ install-installed_testPROGRAMS install-installed_testSCRIPTS \ install-installed_test_metaDATA install-man \ install-nobase_installed_testDATA install-pdf install-pdf-am \ diff -Nru mutter-3.29.92/clutter/tests/interactive/Makefile.in mutter-3.30.0/clutter/tests/interactive/Makefile.in --- mutter-3.29.92/clutter/tests/interactive/Makefile.in 2018-08-29 16:42:51.000000000 +0000 +++ mutter-3.30.0/clutter/tests/interactive/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -211,7 +211,57 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test_interactive-test-actors.Po \ + ./$(DEPDIR)/test_interactive-test-animation.Po \ + ./$(DEPDIR)/test_interactive-test-animator.Po \ + ./$(DEPDIR)/test_interactive-test-bind-constraint.Po \ + ./$(DEPDIR)/test_interactive-test-binding-pool.Po \ + ./$(DEPDIR)/test_interactive-test-cairo-clock.Po \ + ./$(DEPDIR)/test_interactive-test-cairo-flowers.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po \ + ./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po \ + ./$(DEPDIR)/test_interactive-test-content.Po \ + ./$(DEPDIR)/test_interactive-test-devices.Po \ + ./$(DEPDIR)/test_interactive-test-easing.Po \ + ./$(DEPDIR)/test_interactive-test-events.Po \ + ./$(DEPDIR)/test_interactive-test-fbo.Po \ + ./$(DEPDIR)/test_interactive-test-grab.Po \ + ./$(DEPDIR)/test_interactive-test-image.Po \ + ./$(DEPDIR)/test_interactive-test-keyframe-transition.Po \ + ./$(DEPDIR)/test_interactive-test-layout.Po \ + ./$(DEPDIR)/test_interactive-test-main.Po \ + ./$(DEPDIR)/test_interactive-test-multistage.Po \ + ./$(DEPDIR)/test_interactive-test-paint-wrapper.Po \ + ./$(DEPDIR)/test_interactive-test-path-constraint.Po \ + ./$(DEPDIR)/test_interactive-test-pixmap.Po \ + ./$(DEPDIR)/test_interactive-test-rotate-zoom.Po \ + ./$(DEPDIR)/test_interactive-test-scale.Po \ + ./$(DEPDIR)/test_interactive-test-script.Po \ + ./$(DEPDIR)/test_interactive-test-scrolling.Po \ + ./$(DEPDIR)/test_interactive-test-shader-effects.Po \ + ./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po \ + ./$(DEPDIR)/test_interactive-test-stage-sizing.Po \ + ./$(DEPDIR)/test_interactive-test-state-animator.Po \ + ./$(DEPDIR)/test_interactive-test-state-script.Po \ + ./$(DEPDIR)/test_interactive-test-state.Po \ + ./$(DEPDIR)/test_interactive-test-swipe-action.Po \ + ./$(DEPDIR)/test_interactive-test-table-layout.Po \ + ./$(DEPDIR)/test_interactive-test-text-field.Po \ + ./$(DEPDIR)/test_interactive-test-text.Po \ + ./$(DEPDIR)/test_interactive-test-texture-async.Po \ + ./$(DEPDIR)/test_interactive-test-texture-material.Po \ + ./$(DEPDIR)/test_interactive-test-texture-quality.Po \ + ./$(DEPDIR)/test_interactive-test-texture-slicing.Po \ + ./$(DEPDIR)/test_interactive-test-touch-events.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -531,8 +581,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -565,56 +615,62 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-actors.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animation.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animator.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-bind-constraint.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-binding-pool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-clock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-flowers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-content.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-devices.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-easing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-events.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-fbo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-grab.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-image.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-keyframe-transition.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-layout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-multistage.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-paint-wrapper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-path-constraint.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-pixmap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-rotate-zoom.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scale.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-script.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scrolling.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-shader-effects.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-sizing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-animator.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-script.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-swipe-action.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-table-layout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text-field.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-async.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-material.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-quality.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-slicing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-touch-events.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-actors.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animation.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animator.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-bind-constraint.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-binding-pool.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-clock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-flowers.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-content.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-devices.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-easing.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-events.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-fbo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-grab.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-image.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-keyframe-transition.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-multistage.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-paint-wrapper.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-path-constraint.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-pixmap.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-rotate-zoom.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scale.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-script.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scrolling.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-shader-effects.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-sizing.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-animator.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-script.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-swipe-action.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-table-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text-field.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-async.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-material.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-quality.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-slicing.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-touch-events.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1395,7 +1451,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1470,7 +1529,56 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_interactive-test-actors.Po + -rm -f ./$(DEPDIR)/test_interactive-test-animation.Po + -rm -f ./$(DEPDIR)/test_interactive-test-animator.Po + -rm -f ./$(DEPDIR)/test_interactive-test-bind-constraint.Po + -rm -f ./$(DEPDIR)/test_interactive-test-binding-pool.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cairo-clock.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cairo-flowers.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po + -rm -f ./$(DEPDIR)/test_interactive-test-content.Po + -rm -f ./$(DEPDIR)/test_interactive-test-devices.Po + -rm -f ./$(DEPDIR)/test_interactive-test-easing.Po + -rm -f ./$(DEPDIR)/test_interactive-test-events.Po + -rm -f ./$(DEPDIR)/test_interactive-test-fbo.Po + -rm -f ./$(DEPDIR)/test_interactive-test-grab.Po + -rm -f ./$(DEPDIR)/test_interactive-test-image.Po + -rm -f ./$(DEPDIR)/test_interactive-test-keyframe-transition.Po + -rm -f ./$(DEPDIR)/test_interactive-test-layout.Po + -rm -f ./$(DEPDIR)/test_interactive-test-main.Po + -rm -f ./$(DEPDIR)/test_interactive-test-multistage.Po + -rm -f ./$(DEPDIR)/test_interactive-test-paint-wrapper.Po + -rm -f ./$(DEPDIR)/test_interactive-test-path-constraint.Po + -rm -f ./$(DEPDIR)/test_interactive-test-pixmap.Po + -rm -f ./$(DEPDIR)/test_interactive-test-rotate-zoom.Po + -rm -f ./$(DEPDIR)/test_interactive-test-scale.Po + -rm -f ./$(DEPDIR)/test_interactive-test-script.Po + -rm -f ./$(DEPDIR)/test_interactive-test-scrolling.Po + -rm -f ./$(DEPDIR)/test_interactive-test-shader-effects.Po + -rm -f ./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po + -rm -f ./$(DEPDIR)/test_interactive-test-stage-sizing.Po + -rm -f ./$(DEPDIR)/test_interactive-test-state-animator.Po + -rm -f ./$(DEPDIR)/test_interactive-test-state-script.Po + -rm -f ./$(DEPDIR)/test_interactive-test-state.Po + -rm -f ./$(DEPDIR)/test_interactive-test-swipe-action.Po + -rm -f ./$(DEPDIR)/test_interactive-test-table-layout.Po + -rm -f ./$(DEPDIR)/test_interactive-test-text-field.Po + -rm -f ./$(DEPDIR)/test_interactive-test-text.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-async.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-material.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-quality.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-slicing.Po + -rm -f ./$(DEPDIR)/test_interactive-test-touch-events.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1516,7 +1624,56 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_interactive-test-actors.Po + -rm -f ./$(DEPDIR)/test_interactive-test-animation.Po + -rm -f ./$(DEPDIR)/test_interactive-test-animator.Po + -rm -f ./$(DEPDIR)/test_interactive-test-bind-constraint.Po + -rm -f ./$(DEPDIR)/test_interactive-test-binding-pool.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cairo-clock.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cairo-flowers.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po + -rm -f ./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po + -rm -f ./$(DEPDIR)/test_interactive-test-content.Po + -rm -f ./$(DEPDIR)/test_interactive-test-devices.Po + -rm -f ./$(DEPDIR)/test_interactive-test-easing.Po + -rm -f ./$(DEPDIR)/test_interactive-test-events.Po + -rm -f ./$(DEPDIR)/test_interactive-test-fbo.Po + -rm -f ./$(DEPDIR)/test_interactive-test-grab.Po + -rm -f ./$(DEPDIR)/test_interactive-test-image.Po + -rm -f ./$(DEPDIR)/test_interactive-test-keyframe-transition.Po + -rm -f ./$(DEPDIR)/test_interactive-test-layout.Po + -rm -f ./$(DEPDIR)/test_interactive-test-main.Po + -rm -f ./$(DEPDIR)/test_interactive-test-multistage.Po + -rm -f ./$(DEPDIR)/test_interactive-test-paint-wrapper.Po + -rm -f ./$(DEPDIR)/test_interactive-test-path-constraint.Po + -rm -f ./$(DEPDIR)/test_interactive-test-pixmap.Po + -rm -f ./$(DEPDIR)/test_interactive-test-rotate-zoom.Po + -rm -f ./$(DEPDIR)/test_interactive-test-scale.Po + -rm -f ./$(DEPDIR)/test_interactive-test-script.Po + -rm -f ./$(DEPDIR)/test_interactive-test-scrolling.Po + -rm -f ./$(DEPDIR)/test_interactive-test-shader-effects.Po + -rm -f ./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po + -rm -f ./$(DEPDIR)/test_interactive-test-stage-sizing.Po + -rm -f ./$(DEPDIR)/test_interactive-test-state-animator.Po + -rm -f ./$(DEPDIR)/test_interactive-test-state-script.Po + -rm -f ./$(DEPDIR)/test_interactive-test-state.Po + -rm -f ./$(DEPDIR)/test_interactive-test-swipe-action.Po + -rm -f ./$(DEPDIR)/test_interactive-test-table-layout.Po + -rm -f ./$(DEPDIR)/test_interactive-test-text-field.Po + -rm -f ./$(DEPDIR)/test_interactive-test-text.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-async.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-material.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-quality.Po + -rm -f ./$(DEPDIR)/test_interactive-test-texture-slicing.Po + -rm -f ./$(DEPDIR)/test_interactive-test-touch-events.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1537,7 +1694,7 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool clean-local \ cscopelist-am ctags ctags-am distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ diff -Nru mutter-3.29.92/clutter/tests/Makefile.in mutter-3.30.0/clutter/tests/Makefile.in --- mutter-3.29.92/clutter/tests/Makefile.in 2018-08-29 16:42:50.000000000 +0000 +++ mutter-3.30.0/clutter/tests/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -140,7 +140,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -401,8 +401,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -519,7 +519,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/clutter/tests/micro-bench/Makefile.in mutter-3.30.0/clutter/tests/micro-bench/Makefile.in --- mutter-3.29.92/clutter/tests/micro-bench/Makefile.in 2018-08-29 16:42:51.000000000 +0000 +++ mutter-3.30.0/clutter/tests/micro-bench/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -153,7 +153,10 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test-cogl-perf.Po \ + ./$(DEPDIR)/test-picking.Po ./$(DEPDIR)/test-random-text.Po \ + ./$(DEPDIR)/test-text-perf.Po ./$(DEPDIR)/test-text.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -442,8 +445,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -490,11 +493,17 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-cogl-perf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-random-text.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-cogl-perf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-random-text.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -575,7 +584,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -646,7 +658,11 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test-cogl-perf.Po + -rm -f ./$(DEPDIR)/test-picking.Po + -rm -f ./$(DEPDIR)/test-random-text.Po + -rm -f ./$(DEPDIR)/test-text-perf.Po + -rm -f ./$(DEPDIR)/test-text.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -692,7 +708,11 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test-cogl-perf.Po + -rm -f ./$(DEPDIR)/test-picking.Po + -rm -f ./$(DEPDIR)/test-random-text.Po + -rm -f ./$(DEPDIR)/test-text-perf.Po + -rm -f ./$(DEPDIR)/test-text.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -713,7 +733,7 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.29.92/clutter/tests/performance/Makefile.in mutter-3.30.0/clutter/tests/performance/Makefile.in --- mutter-3.29.92/clutter/tests/performance/Makefile.in 2018-08-29 16:42:51.000000000 +0000 +++ mutter-3.30.0/clutter/tests/performance/Makefile.in 2018-09-03 22:06:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,7 +164,12 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test-picking.Po \ + ./$(DEPDIR)/test-state-hidden.Po \ + ./$(DEPDIR)/test-state-interactive.Po \ + ./$(DEPDIR)/test-state-mini.Po ./$(DEPDIR)/test-state-pick.Po \ + ./$(DEPDIR)/test-state.Po ./$(DEPDIR)/test-text-perf.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -455,8 +460,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -511,13 +516,19 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-hidden.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-interactive.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-mini.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-pick.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-hidden.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-interactive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-mini.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-pick.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -598,7 +609,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -669,7 +683,13 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test-picking.Po + -rm -f ./$(DEPDIR)/test-state-hidden.Po + -rm -f ./$(DEPDIR)/test-state-interactive.Po + -rm -f ./$(DEPDIR)/test-state-mini.Po + -rm -f ./$(DEPDIR)/test-state-pick.Po + -rm -f ./$(DEPDIR)/test-state.Po + -rm -f ./$(DEPDIR)/test-text-perf.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -715,7 +735,13 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test-picking.Po + -rm -f ./$(DEPDIR)/test-state-hidden.Po + -rm -f ./$(DEPDIR)/test-state-interactive.Po + -rm -f ./$(DEPDIR)/test-state-mini.Po + -rm -f ./$(DEPDIR)/test-state-pick.Po + -rm -f ./$(DEPDIR)/test-state.Po + -rm -f ./$(DEPDIR)/test-text-perf.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -736,7 +762,7 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.29.92/cogl/aclocal.m4 mutter-3.30.0/cogl/aclocal.m4 --- mutter-3.29.92/cogl/aclocal.m4 2018-08-29 16:42:37.000000000 +0000 +++ mutter-3.30.0/cogl/aclocal.m4 2018-09-03 22:06:24.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -579,7 +579,7 @@ rm -f conf.glibtest ]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -591,10 +591,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -610,14 +610,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -669,7 +669,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -700,7 +700,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -891,13 +891,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -905,49 +904,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -956,18 +947,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1054,8 +1044,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -1122,7 +1112,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -1164,7 +1154,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1185,7 +1175,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1206,7 +1196,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1214,49 +1204,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1295,7 +1278,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1324,7 +1307,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1371,7 +1354,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1390,7 +1373,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1471,7 +1454,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1531,7 +1514,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1559,7 +1542,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1578,7 +1561,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mutter-3.29.92/cogl/build/compile mutter-3.30.0/cogl/build/compile --- mutter-3.29.92/cogl/build/compile 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/build/compile 2018-09-03 22:06:25.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/cogl/build/config.guess mutter-3.30.0/cogl/build/config.guess --- mutter-3.29.92/cogl/build/config.guess 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/build/config.guess 2018-09-03 22:06:25.000000000 +0000 @@ -1,8 +1,8 @@ -#!/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-08-08' +timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -107,9 +107,9 @@ dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,30 +176,30 @@ # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +215,10 @@ ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,49 +226,55 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; *:Redox:*:*) - echo ${UNAME_MACHINE}-unknown-redox + echo "$UNAME_MACHINE"-unknown-redox exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -313,28 +326,19 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -346,7 +350,7 @@ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -373,19 +377,19 @@ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. @@ -398,13 +402,13 @@ SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -413,25 +417,25 @@ ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -442,44 +446,44 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -488,23 +492,23 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -530,17 +534,17 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -557,7 +561,7 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -569,14 +573,14 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -587,7 +591,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -601,7 +605,7 @@ exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -610,18 +614,18 @@ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -636,28 +640,28 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -690,13 +694,13 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -715,15 +719,15 @@ HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -748,11 +752,11 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -761,7 +765,7 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -769,9 +773,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -796,128 +800,109 @@ echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -931,63 +916,63 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -1001,70 +986,70 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1078,34 +1063,34 @@ # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1115,12 +1100,12 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1130,9 +1115,9 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1152,9 +1137,9 @@ exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1174,9 +1159,9 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1185,28 +1170,28 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1217,7 +1202,7 @@ *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1237,23 +1222,23 @@ exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1272,39 +1257,39 @@ echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ @@ -1332,7 +1317,7 @@ # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1340,22 +1325,25 @@ UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1364,7 +1352,7 @@ echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 @@ -1375,7 +1363,7 @@ else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1396,14 +1384,14 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1412,32 +1400,44 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 </dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.29.92/cogl/build/config.sub mutter-3.30.0/cogl/build/config.sub --- mutter-3.29.92/cogl/build/config.sub 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/build/config.sub 2018-09-03 22:06:25.000000000 +0000 @@ -1,8 +1,8 @@ -#!/bin/sh +#! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-04-02' +timestamp='2018-05-05' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,7 +94,7 @@ *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,28 +110,48 @@ exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; +# Spilt fields of configuration type +IFS="-" read -r field1 field2 field3 field4 <&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -382,7 +403,7 @@ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -423,6 +444,7 @@ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ + | nfp-* \ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ @@ -461,7 +483,7 @@ # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -495,7 +517,7 @@ basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -540,7 +562,7 @@ os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -548,13 +570,13 @@ os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -643,7 +665,7 @@ basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; @@ -652,7 +674,7 @@ os=$os"spe" ;; e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=$os"spe" ;; ebmon29k) @@ -744,9 +766,6 @@ hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -759,26 +778,26 @@ basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -797,19 +816,16 @@ os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -841,10 +857,10 @@ os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -863,7 +879,7 @@ os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -905,7 +921,7 @@ basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -950,6 +966,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; nsx-tandem) basic_machine=nsx-tandem ;; @@ -985,7 +1004,7 @@ os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -1001,7 +1020,7 @@ basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1016,16 +1035,16 @@ basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1035,23 +1054,23 @@ ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1105,17 +1124,10 @@ sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1134,7 +1146,7 @@ os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1248,9 +1260,6 @@ basic_machine=a29k-wrs os=-vxworks ;; - wasm32) - basic_machine=wasm32-unknown - ;; w65*) basic_machine=w65-wdc os=-none @@ -1259,6 +1268,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1267,20 +1279,12 @@ basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1309,10 +1313,6 @@ vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1322,9 +1322,6 @@ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1344,7 +1341,7 @@ # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1352,10 +1349,10 @@ # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1363,11 +1360,11 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1378,18 +1375,19 @@ -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1399,25 +1397,26 @@ | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1434,12 +1433,12 @@ -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1448,10 +1447,10 @@ os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1462,12 +1461,6 @@ -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1492,7 +1485,7 @@ -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1514,7 +1507,7 @@ -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1529,34 +1522,44 @@ -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; -ios) ;; -none) ;; + -*-eabi) + case $basic_machine in + arm*) + ;; + esac + ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1652,9 +1655,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1694,7 +1694,7 @@ m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1709,9 +1709,6 @@ i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1821,15 +1818,15 @@ vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.29.92/cogl/build/depcomp mutter-3.30.0/cogl/build/depcomp --- mutter-3.29.92/cogl/build/depcomp 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/build/depcomp 2018-09-03 22:06:26.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/cogl/build/install-sh mutter-3.30.0/cogl/build/install-sh --- mutter-3.29.92/cogl/build/install-sh 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/build/install-sh 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,8 +444,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -493,7 +510,7 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/cogl/build/missing mutter-3.30.0/cogl/build/missing --- mutter-3.29.92/cogl/build/missing 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/build/missing 2018-09-03 22:06:25.000000000 +0000 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.29.92/cogl/cogl/Makefile.in mutter-3.30.0/cogl/cogl/Makefile.in --- mutter-3.29.92/cogl/cogl/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/cogl/Makefile.in 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -439,7 +439,100 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/cogl-atlas-texture.Plo \ + ./$(DEPDIR)/cogl-atlas.Plo \ + ./$(DEPDIR)/cogl-attribute-buffer.Plo \ + ./$(DEPDIR)/cogl-attribute.Plo \ + ./$(DEPDIR)/cogl-bitmap-conversion.Plo \ + ./$(DEPDIR)/cogl-bitmap-pixbuf.Plo ./$(DEPDIR)/cogl-bitmap.Plo \ + ./$(DEPDIR)/cogl-bitmask.Plo ./$(DEPDIR)/cogl-blend-string.Plo \ + ./$(DEPDIR)/cogl-blit.Plo ./$(DEPDIR)/cogl-boxed-value.Plo \ + ./$(DEPDIR)/cogl-buffer.Plo ./$(DEPDIR)/cogl-clip-stack.Plo \ + ./$(DEPDIR)/cogl-closure-list.Plo ./$(DEPDIR)/cogl-color.Plo \ + ./$(DEPDIR)/cogl-config.Plo ./$(DEPDIR)/cogl-context.Plo \ + ./$(DEPDIR)/cogl-debug.Plo ./$(DEPDIR)/cogl-depth-state.Plo \ + ./$(DEPDIR)/cogl-display.Plo ./$(DEPDIR)/cogl-error.Plo \ + ./$(DEPDIR)/cogl-euler.Plo \ + ./$(DEPDIR)/cogl-feature-private.Plo \ + ./$(DEPDIR)/cogl-fence.Plo ./$(DEPDIR)/cogl-frame-info.Plo \ + ./$(DEPDIR)/cogl-framebuffer.Plo \ + ./$(DEPDIR)/cogl-gles2-context.Plo \ + ./$(DEPDIR)/cogl-glib-source.Plo \ + ./$(DEPDIR)/cogl-glsl-shader.Plo ./$(DEPDIR)/cogl-gpu-info.Plo \ + ./$(DEPDIR)/cogl-gtype.Plo ./$(DEPDIR)/cogl-index-buffer.Plo \ + ./$(DEPDIR)/cogl-indices.Plo ./$(DEPDIR)/cogl-journal.Plo \ + ./$(DEPDIR)/cogl-list.Plo ./$(DEPDIR)/cogl-magazine.Plo \ + ./$(DEPDIR)/cogl-matrix-stack.Plo ./$(DEPDIR)/cogl-matrix.Plo \ + ./$(DEPDIR)/cogl-memory-stack.Plo \ + ./$(DEPDIR)/cogl-meta-texture.Plo ./$(DEPDIR)/cogl-node.Plo \ + ./$(DEPDIR)/cogl-object.Plo \ + ./$(DEPDIR)/cogl-onscreen-template.Plo \ + ./$(DEPDIR)/cogl-onscreen.Plo ./$(DEPDIR)/cogl-output.Plo \ + ./$(DEPDIR)/cogl-pipeline-cache.Plo \ + ./$(DEPDIR)/cogl-pipeline-debug.Plo \ + ./$(DEPDIR)/cogl-pipeline-hash-table.Plo \ + ./$(DEPDIR)/cogl-pipeline-layer-state.Plo \ + ./$(DEPDIR)/cogl-pipeline-layer.Plo \ + ./$(DEPDIR)/cogl-pipeline-snippet.Plo \ + ./$(DEPDIR)/cogl-pipeline-state.Plo \ + ./$(DEPDIR)/cogl-pipeline.Plo \ + ./$(DEPDIR)/cogl-pixel-buffer.Plo \ + ./$(DEPDIR)/cogl-point-in-poly.Plo ./$(DEPDIR)/cogl-poll.Plo \ + ./$(DEPDIR)/cogl-primitive-texture.Plo \ + ./$(DEPDIR)/cogl-primitive.Plo ./$(DEPDIR)/cogl-primitives.Plo \ + ./$(DEPDIR)/cogl-profile.Plo ./$(DEPDIR)/cogl-quaternion.Plo \ + ./$(DEPDIR)/cogl-rectangle-map.Plo \ + ./$(DEPDIR)/cogl-renderer.Plo \ + ./$(DEPDIR)/cogl-sampler-cache.Plo \ + ./$(DEPDIR)/cogl-snippet.Plo ./$(DEPDIR)/cogl-spans.Plo \ + ./$(DEPDIR)/cogl-sub-texture.Plo \ + ./$(DEPDIR)/cogl-swap-chain.Plo \ + ./$(DEPDIR)/cogl-texture-2d-sliced.Plo \ + ./$(DEPDIR)/cogl-texture-2d.Plo \ + ./$(DEPDIR)/cogl-texture-3d.Plo \ + ./$(DEPDIR)/cogl-texture-rectangle.Plo \ + ./$(DEPDIR)/cogl-texture.Plo ./$(DEPDIR)/cogl-util.Plo \ + ./$(DEPDIR)/cogl-vector.Plo ./$(DEPDIR)/cogl-xlib-renderer.Plo \ + ./$(DEPDIR)/cogl-xlib.Plo ./$(DEPDIR)/cogl.Plo \ + deprecated/$(DEPDIR)/cogl-auto-texture.Plo \ + deprecated/$(DEPDIR)/cogl-clutter.Plo \ + deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo \ + deprecated/$(DEPDIR)/cogl-material-compat.Plo \ + deprecated/$(DEPDIR)/cogl-program.Plo \ + deprecated/$(DEPDIR)/cogl-shader.Plo \ + deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo \ + driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo \ + driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo \ + driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo \ + driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo \ + driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo \ + driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo \ + driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo \ + driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo \ + driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo \ + driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo \ + driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo \ + driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo \ + driver/gl/$(DEPDIR)/cogl-texture-gl.Plo \ + driver/gl/$(DEPDIR)/cogl-util-gl.Plo \ + driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo \ + driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo \ + driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo \ + driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo \ + driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo \ + driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo \ + driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo \ + driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo \ + driver/nop/$(DEPDIR)/cogl-driver-nop.Plo \ + driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo \ + driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo \ + winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo \ + winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo \ + winsys/$(DEPDIR)/cogl-winsys-egl.Plo \ + winsys/$(DEPDIR)/cogl-winsys-glx.Plo \ + winsys/$(DEPDIR)/cogl-winsys-stub.Plo \ + winsys/$(DEPDIR)/cogl-winsys.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -517,7 +610,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -1025,8 +1118,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1215,122 +1308,128 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-conversion.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-pixbuf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmask.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blend-string.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blit.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-boxed-value.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-clip-stack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-closure-list.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-color.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-config.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-debug.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-depth-state.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-display.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-euler.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-feature-private.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-fence.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-frame-info.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-framebuffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glib-source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glsl-shader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gpu-info.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gtype.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-index-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-indices.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-journal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-list.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-magazine.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix-stack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-memory-stack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-meta-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-node.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-object.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen-template.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-output.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-cache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-debug.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-hash-table.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer-state.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-snippet.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-state.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pixel-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-point-in-poly.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-poll.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitives.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-profile.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-quaternion.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-rectangle-map.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-renderer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sampler-cache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-snippet.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-spans.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sub-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-swap-chain.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d-sliced.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-3d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-rectangle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-vector.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib-renderer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-auto-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-clutter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-material-compat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-program.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-shader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-util-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-driver-nop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-glx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-stub.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-conversion.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-pixbuf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmask.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blend-string.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blit.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-boxed-value.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-clip-stack.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-closure-list.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-color.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-config.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-debug.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-depth-state.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-display.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-euler.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-feature-private.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-fence.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-frame-info.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-framebuffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glib-source.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glsl-shader.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gpu-info.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gtype.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-index-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-indices.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-journal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-list.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-magazine.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix-stack.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-memory-stack.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-meta-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-node.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-object.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen-template.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-output.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-cache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-debug.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-hash-table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer-state.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-snippet.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-state.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pixel-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-point-in-poly.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-poll.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitives.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-profile.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-quaternion.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-rectangle-map.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-renderer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sampler-cache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-snippet.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-spans.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sub-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-swap-chain.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d-sliced.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-3d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-rectangle.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-vector.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib-renderer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-auto-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-clutter.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-material-compat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-program.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-shader.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-util-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-driver-nop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-glx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-stub.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1614,7 +1713,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1730,7 +1832,122 @@ mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) deprecated/$(DEPDIR) driver/gl/$(DEPDIR) driver/gl/gl/$(DEPDIR) driver/gl/gles/$(DEPDIR) driver/nop/$(DEPDIR) winsys/$(DEPDIR) + -rm -f ./$(DEPDIR)/cogl-atlas-texture.Plo + -rm -f ./$(DEPDIR)/cogl-atlas.Plo + -rm -f ./$(DEPDIR)/cogl-attribute-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-attribute.Plo + -rm -f ./$(DEPDIR)/cogl-bitmap-conversion.Plo + -rm -f ./$(DEPDIR)/cogl-bitmap-pixbuf.Plo + -rm -f ./$(DEPDIR)/cogl-bitmap.Plo + -rm -f ./$(DEPDIR)/cogl-bitmask.Plo + -rm -f ./$(DEPDIR)/cogl-blend-string.Plo + -rm -f ./$(DEPDIR)/cogl-blit.Plo + -rm -f ./$(DEPDIR)/cogl-boxed-value.Plo + -rm -f ./$(DEPDIR)/cogl-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-clip-stack.Plo + -rm -f ./$(DEPDIR)/cogl-closure-list.Plo + -rm -f ./$(DEPDIR)/cogl-color.Plo + -rm -f ./$(DEPDIR)/cogl-config.Plo + -rm -f ./$(DEPDIR)/cogl-context.Plo + -rm -f ./$(DEPDIR)/cogl-debug.Plo + -rm -f ./$(DEPDIR)/cogl-depth-state.Plo + -rm -f ./$(DEPDIR)/cogl-display.Plo + -rm -f ./$(DEPDIR)/cogl-error.Plo + -rm -f ./$(DEPDIR)/cogl-euler.Plo + -rm -f ./$(DEPDIR)/cogl-feature-private.Plo + -rm -f ./$(DEPDIR)/cogl-fence.Plo + -rm -f ./$(DEPDIR)/cogl-frame-info.Plo + -rm -f ./$(DEPDIR)/cogl-framebuffer.Plo + -rm -f ./$(DEPDIR)/cogl-gles2-context.Plo + -rm -f ./$(DEPDIR)/cogl-glib-source.Plo + -rm -f ./$(DEPDIR)/cogl-glsl-shader.Plo + -rm -f ./$(DEPDIR)/cogl-gpu-info.Plo + -rm -f ./$(DEPDIR)/cogl-gtype.Plo + -rm -f ./$(DEPDIR)/cogl-index-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-indices.Plo + -rm -f ./$(DEPDIR)/cogl-journal.Plo + -rm -f ./$(DEPDIR)/cogl-list.Plo + -rm -f ./$(DEPDIR)/cogl-magazine.Plo + -rm -f ./$(DEPDIR)/cogl-matrix-stack.Plo + -rm -f ./$(DEPDIR)/cogl-matrix.Plo + -rm -f ./$(DEPDIR)/cogl-memory-stack.Plo + -rm -f ./$(DEPDIR)/cogl-meta-texture.Plo + -rm -f ./$(DEPDIR)/cogl-node.Plo + -rm -f ./$(DEPDIR)/cogl-object.Plo + -rm -f ./$(DEPDIR)/cogl-onscreen-template.Plo + -rm -f ./$(DEPDIR)/cogl-onscreen.Plo + -rm -f ./$(DEPDIR)/cogl-output.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-cache.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-debug.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-hash-table.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-layer-state.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-layer.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-snippet.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-state.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline.Plo + -rm -f ./$(DEPDIR)/cogl-pixel-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-point-in-poly.Plo + -rm -f ./$(DEPDIR)/cogl-poll.Plo + -rm -f ./$(DEPDIR)/cogl-primitive-texture.Plo + -rm -f ./$(DEPDIR)/cogl-primitive.Plo + -rm -f ./$(DEPDIR)/cogl-primitives.Plo + -rm -f ./$(DEPDIR)/cogl-profile.Plo + -rm -f ./$(DEPDIR)/cogl-quaternion.Plo + -rm -f ./$(DEPDIR)/cogl-rectangle-map.Plo + -rm -f ./$(DEPDIR)/cogl-renderer.Plo + -rm -f ./$(DEPDIR)/cogl-sampler-cache.Plo + -rm -f ./$(DEPDIR)/cogl-snippet.Plo + -rm -f ./$(DEPDIR)/cogl-spans.Plo + -rm -f ./$(DEPDIR)/cogl-sub-texture.Plo + -rm -f ./$(DEPDIR)/cogl-swap-chain.Plo + -rm -f ./$(DEPDIR)/cogl-texture-2d-sliced.Plo + -rm -f ./$(DEPDIR)/cogl-texture-2d.Plo + -rm -f ./$(DEPDIR)/cogl-texture-3d.Plo + -rm -f ./$(DEPDIR)/cogl-texture-rectangle.Plo + -rm -f ./$(DEPDIR)/cogl-texture.Plo + -rm -f ./$(DEPDIR)/cogl-util.Plo + -rm -f ./$(DEPDIR)/cogl-vector.Plo + -rm -f ./$(DEPDIR)/cogl-xlib-renderer.Plo + -rm -f ./$(DEPDIR)/cogl-xlib.Plo + -rm -f ./$(DEPDIR)/cogl.Plo + -rm -f deprecated/$(DEPDIR)/cogl-auto-texture.Plo + -rm -f deprecated/$(DEPDIR)/cogl-clutter.Plo + -rm -f deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/cogl-material-compat.Plo + -rm -f deprecated/$(DEPDIR)/cogl-program.Plo + -rm -f deprecated/$(DEPDIR)/cogl-shader.Plo + -rm -f deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-texture-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-util-gl.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo + -rm -f driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo + -rm -f driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-driver-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo + -rm -f winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-egl.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-glx.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-stub.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1780,7 +1997,122 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) deprecated/$(DEPDIR) driver/gl/$(DEPDIR) driver/gl/gl/$(DEPDIR) driver/gl/gles/$(DEPDIR) driver/nop/$(DEPDIR) winsys/$(DEPDIR) + -rm -f ./$(DEPDIR)/cogl-atlas-texture.Plo + -rm -f ./$(DEPDIR)/cogl-atlas.Plo + -rm -f ./$(DEPDIR)/cogl-attribute-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-attribute.Plo + -rm -f ./$(DEPDIR)/cogl-bitmap-conversion.Plo + -rm -f ./$(DEPDIR)/cogl-bitmap-pixbuf.Plo + -rm -f ./$(DEPDIR)/cogl-bitmap.Plo + -rm -f ./$(DEPDIR)/cogl-bitmask.Plo + -rm -f ./$(DEPDIR)/cogl-blend-string.Plo + -rm -f ./$(DEPDIR)/cogl-blit.Plo + -rm -f ./$(DEPDIR)/cogl-boxed-value.Plo + -rm -f ./$(DEPDIR)/cogl-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-clip-stack.Plo + -rm -f ./$(DEPDIR)/cogl-closure-list.Plo + -rm -f ./$(DEPDIR)/cogl-color.Plo + -rm -f ./$(DEPDIR)/cogl-config.Plo + -rm -f ./$(DEPDIR)/cogl-context.Plo + -rm -f ./$(DEPDIR)/cogl-debug.Plo + -rm -f ./$(DEPDIR)/cogl-depth-state.Plo + -rm -f ./$(DEPDIR)/cogl-display.Plo + -rm -f ./$(DEPDIR)/cogl-error.Plo + -rm -f ./$(DEPDIR)/cogl-euler.Plo + -rm -f ./$(DEPDIR)/cogl-feature-private.Plo + -rm -f ./$(DEPDIR)/cogl-fence.Plo + -rm -f ./$(DEPDIR)/cogl-frame-info.Plo + -rm -f ./$(DEPDIR)/cogl-framebuffer.Plo + -rm -f ./$(DEPDIR)/cogl-gles2-context.Plo + -rm -f ./$(DEPDIR)/cogl-glib-source.Plo + -rm -f ./$(DEPDIR)/cogl-glsl-shader.Plo + -rm -f ./$(DEPDIR)/cogl-gpu-info.Plo + -rm -f ./$(DEPDIR)/cogl-gtype.Plo + -rm -f ./$(DEPDIR)/cogl-index-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-indices.Plo + -rm -f ./$(DEPDIR)/cogl-journal.Plo + -rm -f ./$(DEPDIR)/cogl-list.Plo + -rm -f ./$(DEPDIR)/cogl-magazine.Plo + -rm -f ./$(DEPDIR)/cogl-matrix-stack.Plo + -rm -f ./$(DEPDIR)/cogl-matrix.Plo + -rm -f ./$(DEPDIR)/cogl-memory-stack.Plo + -rm -f ./$(DEPDIR)/cogl-meta-texture.Plo + -rm -f ./$(DEPDIR)/cogl-node.Plo + -rm -f ./$(DEPDIR)/cogl-object.Plo + -rm -f ./$(DEPDIR)/cogl-onscreen-template.Plo + -rm -f ./$(DEPDIR)/cogl-onscreen.Plo + -rm -f ./$(DEPDIR)/cogl-output.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-cache.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-debug.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-hash-table.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-layer-state.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-layer.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-snippet.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline-state.Plo + -rm -f ./$(DEPDIR)/cogl-pipeline.Plo + -rm -f ./$(DEPDIR)/cogl-pixel-buffer.Plo + -rm -f ./$(DEPDIR)/cogl-point-in-poly.Plo + -rm -f ./$(DEPDIR)/cogl-poll.Plo + -rm -f ./$(DEPDIR)/cogl-primitive-texture.Plo + -rm -f ./$(DEPDIR)/cogl-primitive.Plo + -rm -f ./$(DEPDIR)/cogl-primitives.Plo + -rm -f ./$(DEPDIR)/cogl-profile.Plo + -rm -f ./$(DEPDIR)/cogl-quaternion.Plo + -rm -f ./$(DEPDIR)/cogl-rectangle-map.Plo + -rm -f ./$(DEPDIR)/cogl-renderer.Plo + -rm -f ./$(DEPDIR)/cogl-sampler-cache.Plo + -rm -f ./$(DEPDIR)/cogl-snippet.Plo + -rm -f ./$(DEPDIR)/cogl-spans.Plo + -rm -f ./$(DEPDIR)/cogl-sub-texture.Plo + -rm -f ./$(DEPDIR)/cogl-swap-chain.Plo + -rm -f ./$(DEPDIR)/cogl-texture-2d-sliced.Plo + -rm -f ./$(DEPDIR)/cogl-texture-2d.Plo + -rm -f ./$(DEPDIR)/cogl-texture-3d.Plo + -rm -f ./$(DEPDIR)/cogl-texture-rectangle.Plo + -rm -f ./$(DEPDIR)/cogl-texture.Plo + -rm -f ./$(DEPDIR)/cogl-util.Plo + -rm -f ./$(DEPDIR)/cogl-vector.Plo + -rm -f ./$(DEPDIR)/cogl-xlib-renderer.Plo + -rm -f ./$(DEPDIR)/cogl-xlib.Plo + -rm -f ./$(DEPDIR)/cogl.Plo + -rm -f deprecated/$(DEPDIR)/cogl-auto-texture.Plo + -rm -f deprecated/$(DEPDIR)/cogl-clutter.Plo + -rm -f deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo + -rm -f deprecated/$(DEPDIR)/cogl-material-compat.Plo + -rm -f deprecated/$(DEPDIR)/cogl-program.Plo + -rm -f deprecated/$(DEPDIR)/cogl-shader.Plo + -rm -f deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-texture-gl.Plo + -rm -f driver/gl/$(DEPDIR)/cogl-util-gl.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo + -rm -f driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo + -rm -f driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo + -rm -f driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-driver-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo + -rm -f driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo + -rm -f winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-egl.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-glx.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys-stub.Plo + -rm -f winsys/$(DEPDIR)/cogl-winsys.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1807,8 +2139,8 @@ .MAKE: $(am__recursive_targets) all check install install-am \ install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles check check-am clean clean-generic clean-libtool \ clean-mutterlibLTLIBRARIES cscopelist-am ctags ctags-am \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.29.92/cogl/cogl-gles2/Makefile.in mutter-3.30.0/cogl/cogl-gles2/Makefile.in --- mutter-3.29.92/cogl/cogl-gles2/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/cogl-gles2/Makefile.in 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,7 +170,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/cogl-gles2-api.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -461,8 +462,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -518,7 +519,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-api.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-api.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -644,7 +651,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -718,7 +728,7 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/cogl-gles2-api.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -765,7 +775,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/cogl-gles2-api.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -787,11 +797,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-coglgles2includeHEADERS install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ diff -Nru mutter-3.29.92/cogl/cogl-pango/Makefile.in mutter-3.30.0/cogl/cogl-pango/Makefile.in --- mutter-3.29.92/cogl/cogl-pango/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/cogl-pango/Makefile.in 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,7 +184,12 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo \ + ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo \ + ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo \ + ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo \ + ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -517,8 +522,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -574,11 +579,17 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -781,7 +792,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -856,7 +870,11 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -904,7 +922,11 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -927,11 +949,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-cogl_pangoheadersHEADERS install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ install-girDATA install-html install-html-am install-info \ diff -Nru mutter-3.29.92/cogl/cogl-path/Makefile.in mutter-3.30.0/cogl/cogl-path/Makefile.in --- mutter-3.29.92/cogl/cogl-path/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/cogl-path/Makefile.in 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -212,7 +212,18 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo \ + ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo \ + tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -573,8 +584,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/build/autotools/Makefile.am.enums $(am__empty): @@ -666,17 +677,23 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -901,7 +918,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -981,7 +1001,17 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) tesselator/$(DEPDIR) + -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1029,7 +1059,17 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) tesselator/$(DEPDIR) + -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo + -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo + -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1053,11 +1093,11 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-cogl_pathheadersHEADERS install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ diff -Nru mutter-3.29.92/cogl/configure mutter-3.30.0/cogl/configure --- mutter-3.29.92/cogl/configure 2018-08-29 16:42:38.000000000 +0000 +++ mutter-3.30.0/cogl/configure 2018-09-03 22:06:24.000000000 +0000 @@ -778,7 +778,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR am__untar @@ -862,7 +861,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -4183,7 +4183,7 @@ # want to know if the user specified custom cflags or not. cflags_set=${CFLAGS+set} -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4609,45 +4609,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -4750,8 +4750,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -5046,7 +5046,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -22532,7 +22532,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -23546,29 +23546,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23586,53 +23592,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) diff -Nru mutter-3.29.92/cogl/Makefile.in mutter-3.30.0/cogl/Makefile.in --- mutter-3.29.92/cogl/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/Makefile.in 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -145,7 +145,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)cogl-config.h.in cogl-mutter-config.h.in # Read a list of newline-separated strings from the standard input, @@ -456,8 +456,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -607,7 +607,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru mutter-3.29.92/cogl/test-fixtures/Makefile.in mutter-3.30.0/cogl/test-fixtures/Makefile.in --- mutter-3.29.92/cogl/test-fixtures/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/test-fixtures/Makefile.in 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -133,7 +133,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -405,8 +406,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -438,7 +439,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -529,7 +536,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -599,7 +609,7 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -645,7 +655,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -666,16 +676,16 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am diff -Nru mutter-3.29.92/cogl/tests/conform/Makefile.in mutter-3.30.0/cogl/tests/conform/Makefile.in --- mutter-3.29.92/cogl/tests/conform/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/tests/conform/Makefile.in 2018-09-03 22:06:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -218,7 +218,54 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test_conformance-test-alpha-test.Po \ + ./$(DEPDIR)/test_conformance-test-alpha-textures.Po \ + ./$(DEPDIR)/test_conformance-test-atlas-migration.Po \ + ./$(DEPDIR)/test_conformance-test-backface-culling.Po \ + ./$(DEPDIR)/test_conformance-test-blend-strings.Po \ + ./$(DEPDIR)/test_conformance-test-blend.Po \ + ./$(DEPDIR)/test_conformance-test-color-hsl.Po \ + ./$(DEPDIR)/test_conformance-test-color-mask.Po \ + ./$(DEPDIR)/test_conformance-test-conform-main.Po \ + ./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po \ + ./$(DEPDIR)/test_conformance-test-custom-attributes.Po \ + ./$(DEPDIR)/test_conformance-test-depth-test.Po \ + ./$(DEPDIR)/test_conformance-test-euler-quaternion.Po \ + ./$(DEPDIR)/test_conformance-test-fence.Po \ + ./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po \ + ./$(DEPDIR)/test_conformance-test-gles2-context.Po \ + ./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po \ + ./$(DEPDIR)/test_conformance-test-layer-remove.Po \ + ./$(DEPDIR)/test_conformance-test-map-buffer-range.Po \ + ./$(DEPDIR)/test_conformance-test-no-gl-header.Po \ + ./$(DEPDIR)/test_conformance-test-npot-texture.Po \ + ./$(DEPDIR)/test_conformance-test-offscreen.Po \ + ./$(DEPDIR)/test_conformance-test-path-clip.Po \ + ./$(DEPDIR)/test_conformance-test-path.Po \ + ./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po \ + ./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po \ + ./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po \ + ./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po \ + ./$(DEPDIR)/test_conformance-test-pixel-buffer.Po \ + ./$(DEPDIR)/test_conformance-test-point-size-attribute.Po \ + ./$(DEPDIR)/test_conformance-test-point-size.Po \ + ./$(DEPDIR)/test_conformance-test-point-sprite.Po \ + ./$(DEPDIR)/test_conformance-test-premult.Po \ + ./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po \ + ./$(DEPDIR)/test_conformance-test-primitive.Po \ + ./$(DEPDIR)/test_conformance-test-read-texture-formats.Po \ + ./$(DEPDIR)/test_conformance-test-snippets.Po \ + ./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po \ + ./$(DEPDIR)/test_conformance-test-sub-texture.Po \ + ./$(DEPDIR)/test_conformance-test-texture-3d.Po \ + ./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po \ + ./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po \ + ./$(DEPDIR)/test_conformance-test-texture-rg.Po \ + ./$(DEPDIR)/test_conformance-test-version.Po \ + ./$(DEPDIR)/test_conformance-test-wrap-modes.Po \ + ./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po \ + ./$(DEPDIR)/test_conformance-test-write-texture-formats.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -578,8 +625,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -659,53 +706,59 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-textures.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-atlas-migration.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-backface-culling.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend-strings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-hsl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-mask.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-conform-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-custom-attributes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-depth-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-euler-quaternion.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-fence.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-gles2-context.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-layer-remove.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-map-buffer-range.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-no-gl-header.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-npot-texture.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-offscreen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path-clip.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pixel-buffer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size-attribute.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-sprite.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-premult.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-read-texture-formats.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-snippets.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sub-texture.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-3d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-rg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-modes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-write-texture-formats.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-textures.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-atlas-migration.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-backface-culling.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend-strings.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-hsl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-mask.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-conform-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-custom-attributes.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-depth-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-euler-quaternion.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-fence.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-gles2-context.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-layer-remove.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-map-buffer-range.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-no-gl-header.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-npot-texture.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-offscreen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path-clip.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pixel-buffer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size-attribute.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-sprite.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-premult.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-read-texture-formats.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-snippets.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sub-texture.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-3d.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-rg.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-version.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-modes.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-write-texture-formats.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1489,7 +1542,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1564,7 +1620,53 @@ clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_conformance-test-alpha-test.Po + -rm -f ./$(DEPDIR)/test_conformance-test-alpha-textures.Po + -rm -f ./$(DEPDIR)/test_conformance-test-atlas-migration.Po + -rm -f ./$(DEPDIR)/test_conformance-test-backface-culling.Po + -rm -f ./$(DEPDIR)/test_conformance-test-blend-strings.Po + -rm -f ./$(DEPDIR)/test_conformance-test-blend.Po + -rm -f ./$(DEPDIR)/test_conformance-test-color-hsl.Po + -rm -f ./$(DEPDIR)/test_conformance-test-color-mask.Po + -rm -f ./$(DEPDIR)/test_conformance-test-conform-main.Po + -rm -f ./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-custom-attributes.Po + -rm -f ./$(DEPDIR)/test_conformance-test-depth-test.Po + -rm -f ./$(DEPDIR)/test_conformance-test-euler-quaternion.Po + -rm -f ./$(DEPDIR)/test_conformance-test-fence.Po + -rm -f ./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po + -rm -f ./$(DEPDIR)/test_conformance-test-gles2-context.Po + -rm -f ./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po + -rm -f ./$(DEPDIR)/test_conformance-test-layer-remove.Po + -rm -f ./$(DEPDIR)/test_conformance-test-map-buffer-range.Po + -rm -f ./$(DEPDIR)/test_conformance-test-no-gl-header.Po + -rm -f ./$(DEPDIR)/test_conformance-test-npot-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-offscreen.Po + -rm -f ./$(DEPDIR)/test_conformance-test-path-clip.Po + -rm -f ./$(DEPDIR)/test_conformance-test-path.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pixel-buffer.Po + -rm -f ./$(DEPDIR)/test_conformance-test-point-size-attribute.Po + -rm -f ./$(DEPDIR)/test_conformance-test-point-size.Po + -rm -f ./$(DEPDIR)/test_conformance-test-point-sprite.Po + -rm -f ./$(DEPDIR)/test_conformance-test-premult.Po + -rm -f ./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po + -rm -f ./$(DEPDIR)/test_conformance-test-primitive.Po + -rm -f ./$(DEPDIR)/test_conformance-test-read-texture-formats.Po + -rm -f ./$(DEPDIR)/test_conformance-test-snippets.Po + -rm -f ./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po + -rm -f ./$(DEPDIR)/test_conformance-test-sub-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-3d.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-rg.Po + -rm -f ./$(DEPDIR)/test_conformance-test-version.Po + -rm -f ./$(DEPDIR)/test_conformance-test-wrap-modes.Po + -rm -f ./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po + -rm -f ./$(DEPDIR)/test_conformance-test-write-texture-formats.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1611,7 +1713,53 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_conformance-test-alpha-test.Po + -rm -f ./$(DEPDIR)/test_conformance-test-alpha-textures.Po + -rm -f ./$(DEPDIR)/test_conformance-test-atlas-migration.Po + -rm -f ./$(DEPDIR)/test_conformance-test-backface-culling.Po + -rm -f ./$(DEPDIR)/test_conformance-test-blend-strings.Po + -rm -f ./$(DEPDIR)/test_conformance-test-blend.Po + -rm -f ./$(DEPDIR)/test_conformance-test-color-hsl.Po + -rm -f ./$(DEPDIR)/test_conformance-test-color-mask.Po + -rm -f ./$(DEPDIR)/test_conformance-test-conform-main.Po + -rm -f ./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-custom-attributes.Po + -rm -f ./$(DEPDIR)/test_conformance-test-depth-test.Po + -rm -f ./$(DEPDIR)/test_conformance-test-euler-quaternion.Po + -rm -f ./$(DEPDIR)/test_conformance-test-fence.Po + -rm -f ./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po + -rm -f ./$(DEPDIR)/test_conformance-test-gles2-context.Po + -rm -f ./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po + -rm -f ./$(DEPDIR)/test_conformance-test-layer-remove.Po + -rm -f ./$(DEPDIR)/test_conformance-test-map-buffer-range.Po + -rm -f ./$(DEPDIR)/test_conformance-test-no-gl-header.Po + -rm -f ./$(DEPDIR)/test_conformance-test-npot-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-offscreen.Po + -rm -f ./$(DEPDIR)/test_conformance-test-path-clip.Po + -rm -f ./$(DEPDIR)/test_conformance-test-path.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po + -rm -f ./$(DEPDIR)/test_conformance-test-pixel-buffer.Po + -rm -f ./$(DEPDIR)/test_conformance-test-point-size-attribute.Po + -rm -f ./$(DEPDIR)/test_conformance-test-point-size.Po + -rm -f ./$(DEPDIR)/test_conformance-test-point-sprite.Po + -rm -f ./$(DEPDIR)/test_conformance-test-premult.Po + -rm -f ./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po + -rm -f ./$(DEPDIR)/test_conformance-test-primitive.Po + -rm -f ./$(DEPDIR)/test_conformance-test-read-texture-formats.Po + -rm -f ./$(DEPDIR)/test_conformance-test-snippets.Po + -rm -f ./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po + -rm -f ./$(DEPDIR)/test_conformance-test-sub-texture.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-3d.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po + -rm -f ./$(DEPDIR)/test_conformance-test-texture-rg.Po + -rm -f ./$(DEPDIR)/test_conformance-test-version.Po + -rm -f ./$(DEPDIR)/test_conformance-test-wrap-modes.Po + -rm -f ./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po + -rm -f ./$(DEPDIR)/test_conformance-test-write-texture-formats.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1633,22 +1781,22 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-insttestPROGRAMS clean-libtool clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-insttestDATA \ - install-insttestPROGRAMS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-testmetaDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-insttestDATA uninstall-insttestPROGRAMS \ - uninstall-testmetaDATA +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-insttestPROGRAMS clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-insttestDATA install-insttestPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-testmetaDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-insttestDATA \ + uninstall-insttestPROGRAMS uninstall-testmetaDATA .PRECIOUS: Makefile diff -Nru mutter-3.29.92/cogl/tests/data/Makefile.in mutter-3.30.0/cogl/tests/data/Makefile.in --- mutter-3.29.92/cogl/tests/data/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/tests/data/Makefile.in 2018-09-03 22:06:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -342,8 +342,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -367,7 +367,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/cogl/tests/Makefile.in mutter-3.30.0/cogl/tests/Makefile.in --- mutter-3.29.92/cogl/tests/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/tests/Makefile.in 2018-09-03 22:06:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -174,7 +174,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -439,8 +439,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -615,7 +615,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/cogl/tests/micro-perf/Makefile.in mutter-3.30.0/cogl/tests/micro-perf/Makefile.in --- mutter-3.29.92/cogl/tests/micro-perf/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/tests/micro-perf/Makefile.in 2018-09-03 22:06:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,7 +134,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test-journal.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -412,8 +413,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -444,7 +445,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-journal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-journal.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -528,7 +535,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -598,7 +608,7 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test-journal.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -644,7 +654,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test-journal.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -665,9 +675,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff -Nru mutter-3.29.92/cogl/tests/unit/Makefile.in mutter-3.30.0/cogl/tests/unit/Makefile.in --- mutter-3.29.92/cogl/tests/unit/Makefile.in 2018-08-29 16:42:39.000000000 +0000 +++ mutter-3.30.0/cogl/tests/unit/Makefile.in 2018-09-03 22:06:26.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -136,7 +136,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test_unit-test-unit-main.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -429,8 +430,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -461,7 +462,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_unit-test-unit-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_unit-test-unit-main.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -559,7 +566,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -631,7 +641,7 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_unit-test-unit-main.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -677,7 +687,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_unit-test-unit-main.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -698,9 +708,9 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff -Nru mutter-3.29.92/configure mutter-3.30.0/configure --- mutter-3.29.92/configure 2018-08-29 16:42:57.000000000 +0000 +++ mutter-3.30.0/configure 2018-09-03 22:06:43.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mutter 3.29.92. +# Generated by GNU Autoconf 2.69 for mutter 3.30.0. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='mutter' PACKAGE_TARNAME='mutter' -PACKAGE_VERSION='3.29.92' -PACKAGE_STRING='mutter 3.29.92' +PACKAGE_VERSION='3.30.0' +PACKAGE_STRING='mutter 3.30.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=mutter' PACKAGE_URL='' @@ -765,7 +765,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -843,7 +842,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -1450,7 +1450,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mutter 3.29.92 to adapt to many kinds of systems. +\`configure' configures mutter 3.30.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1524,7 +1524,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mutter 3.29.92:";; + short | recursive ) echo "Configuration of mutter 3.30.0:";; esac cat <<\_ACEOF @@ -1709,7 +1709,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mutter configure 3.29.92 +mutter configure 3.30.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2124,7 +2124,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mutter $as_me 3.29.92, which was +It was created by mutter $as_me 3.30.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2512,7 +2512,7 @@ subdirs="$subdirs cogl clutter" -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2998,7 +2998,7 @@ # Define the identity of the package. PACKAGE='mutter' - VERSION='3.29.92' + VERSION='3.30.0' cat >>confdefs.h <<_ACEOF @@ -3028,8 +3028,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3196,7 +3196,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3274,45 +3274,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -4771,9 +4771,9 @@ MUTTER_MAJOR_VERSION=3 -MUTTER_MINOR_VERSION=29 -MUTTER_MICRO_VERSION=92 -MUTTER_VERSION=3.29.92 +MUTTER_MINOR_VERSION=30 +MUTTER_MICRO_VERSION=0 +MUTTER_VERSION=3.30.0 MUTTER_PLUGIN_API_VERSION=3 LIBMUTTER_API_VERSION=3 @@ -19191,7 +19191,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mutter $as_me 3.29.92, which was +This file was extended by mutter $as_me 3.30.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19257,7 +19257,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mutter config.status 3.29.92 +mutter config.status 3.30.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19376,7 +19376,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it # from automake < 1.5. @@ -20288,29 +20288,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -20328,53 +20334,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "po-directories":C) @@ -21259,7 +21260,7 @@ " -MUTTER_MINOR_VERSION=29 +MUTTER_MINOR_VERSION=30 if expr $MUTTER_MINOR_VERSION % 2 > /dev/null ; then stable_version=`expr $MUTTER_MINOR_VERSION - 1` echo "This is the UNSTABLE branch of mutter" diff -Nru mutter-3.29.92/configure.ac mutter-3.30.0/configure.ac --- mutter-3.29.92/configure.ac 2018-08-29 16:42:00.000000000 +0000 +++ mutter-3.30.0/configure.ac 2018-09-03 22:05:48.000000000 +0000 @@ -1,8 +1,8 @@ AC_PREREQ(2.62) m4_define([mutter_major_version], [3]) -m4_define([mutter_minor_version], [29]) -m4_define([mutter_micro_version], [92]) +m4_define([mutter_minor_version], [30]) +m4_define([mutter_micro_version], [0]) m4_define([mutter_version], [mutter_major_version.mutter_minor_version.mutter_micro_version]) diff -Nru mutter-3.29.92/data/Makefile.in mutter-3.30.0/data/Makefile.in --- mutter-3.29.92/data/Makefile.in 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/data/Makefile.in 2018-09-03 22:06:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -397,8 +397,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -485,7 +485,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/debian/changelog mutter-3.30.0/debian/changelog --- mutter-3.29.92/debian/changelog 2018-08-30 07:45:01.000000000 +0000 +++ mutter-3.30.0/debian/changelog 2018-09-05 10:30:26.000000000 +0000 @@ -1,3 +1,15 @@ +mutter (3.30.0-1) unstable; urgency=medium + + [ Didier Roche ] + * New upstream release: + - Updated translations + + [ Iain Lane ] + * Merge experimental branch back into master and update references to it + accordingly. This upload is going to unstable. + + -- Didier Roche Wed, 05 Sep 2018 11:30:26 +0100 + mutter (3.29.92-1) experimental; urgency=medium * Team upload @@ -131,6 +143,42 @@ -- Iain Lane Wed, 25 Jul 2018 17:39:37 +0100 +mutter (3.28.3-2) unstable; urgency=medium + + * Team upload + + [ Iain Lane ] + * debian/gbp.conf: Set the upstream branch to upstream/3.28.x, since we've + branched for experimental now. + + [ Marco Trevisan (Treviño) ] + * d/p/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch: + - Avoid crashing when warning about wrongly set crtc mode + (LP: #1754949) + * d/p/gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch: + - Don't crash if drmModeGetResources returns NULL (LP: #1767956) + * d/p/window-wayland-Always-update-monitor-for-non-user-ops.patch: + - Always update monitor in wayland, avoiding crash (LP: #1784398) + * d/p/monitor-manager-Filter-out-low-screen-resolutions.patch: + - Don't return screen resolutions that can't be applied (LP: #1772831) + * d/p/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch, + d/p/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch: + - Don't crash if a modal dialog closes while being dragged + (LP: #1422253) + * d/p/monitor-Use-current-monitor-mode-to-check-whether-active.patch: + - Don't try to use an invalid monitor mode to figure out scaling + (LP: #1723615) + + [ Simon McVittie ] + * Sort patch series in upstream order, with patches applied upstream + first + * d/copyright: Remove obsolete FSF postal addresses + * Standards-Version: 4.1.5 (no changes required) + * Set Rules-Requires-Root to no + * Update symbols file + + -- Simon McVittie Tue, 31 Jul 2018 15:35:03 +0100 + mutter (3.28.3-1) unstable; urgency=medium * New upstream release diff -Nru mutter-3.29.92/debian/control mutter-3.30.0/debian/control --- mutter-3.29.92/debian/control 2018-08-30 07:45:01.000000000 +0000 +++ mutter-3.30.0/debian/control 2018-09-05 10:30:26.000000000 +0000 @@ -58,7 +58,7 @@ zenity Rules-Requires-Root: no Standards-Version: 4.2.1 -Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b debian/experimental +Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git Vcs-Browser: https://salsa.debian.org/gnome-team/mutter Package: mutter diff -Nru mutter-3.29.92/debian/control.in mutter-3.30.0/debian/control.in --- mutter-3.29.92/debian/control.in 2018-08-30 07:45:01.000000000 +0000 +++ mutter-3.30.0/debian/control.in 2018-09-05 10:30:26.000000000 +0000 @@ -54,7 +54,7 @@ zenity Rules-Requires-Root: no Standards-Version: 4.2.1 -Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b debian/experimental +Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git Vcs-Browser: https://salsa.debian.org/gnome-team/mutter Package: mutter diff -Nru mutter-3.29.92/debian/gbp.conf mutter-3.30.0/debian/gbp.conf --- mutter-3.29.92/debian/gbp.conf 2018-08-30 07:45:01.000000000 +0000 +++ mutter-3.30.0/debian/gbp.conf 2018-09-05 10:30:26.000000000 +0000 @@ -1,6 +1,6 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/experimental +debian-branch = debian/master upstream-branch = upstream/latest upstream-vcs-tag = %(version)s patch-numbers = False diff -Nru mutter-3.29.92/debian/watch mutter-3.30.0/debian/watch --- mutter-3.29.92/debian/watch 2018-08-30 07:45:01.000000000 +0000 +++ mutter-3.30.0/debian/watch 2018-09-05 10:30:26.000000000 +0000 @@ -1,3 +1,3 @@ version=4 -https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \ +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ @PACKAGE@@ANY_VERSION@\.tar\.xz diff -Nru mutter-3.29.92/doc/Makefile.in mutter-3.30.0/doc/Makefile.in --- mutter-3.29.92/doc/Makefile.in 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/doc/Makefile.in 2018-09-03 22:06:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -140,7 +140,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -402,8 +402,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -520,7 +520,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/doc/man/Makefile.in mutter-3.30.0/doc/man/Makefile.in --- mutter-3.29.92/doc/man/Makefile.in 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/doc/man/Makefile.in 2018-09-03 22:06:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -371,8 +371,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -439,7 +439,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.29.92/Makefile.in mutter-3.30.0/Makefile.in --- mutter-3.29.92/Makefile.in 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/Makefile.in 2018-09-03 22:06:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -143,7 +143,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, @@ -443,8 +443,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -588,7 +588,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru mutter-3.29.92/NEWS mutter-3.30.0/NEWS --- mutter-3.29.92/NEWS 2018-08-29 16:41:54.000000000 +0000 +++ mutter-3.30.0/NEWS 2018-09-03 22:05:38.000000000 +0000 @@ -1,3 +1,10 @@ +3.30.0 +====== + +Translators: + Fran Dieguez [gl], Balázs Meskó [hu], Rūdolfs Mazurs [lv], + Trần Ngọc Quân [vi], Ask Hjorth Larsen [da], gogo [hr] + 3.29.92 ======= * Avoid crash when a cursor is not found [Sebastian; #254] Binary files /tmp/tmpHdBE7h/ig91FQ4feh/mutter-3.29.92/po/da.gmo and /tmp/tmpHdBE7h/kIMnP3Mfas/mutter-3.30.0/po/da.gmo differ diff -Nru mutter-3.29.92/po/da.po mutter-3.30.0/po/da.po --- mutter-3.29.92/po/da.po 2018-08-10 16:59:10.000000000 +0000 +++ mutter-3.30.0/po/da.po 2018-09-03 22:05:08.000000000 +0000 @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: mutter\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n" -"POT-Creation-Date: 2018-02-06 04:14+0000\n" -"PO-Revision-Date: 2018-03-07 22:29+0100\n" +"POT-Creation-Date: 2018-07-07 09:58+0000\n" +"PO-Revision-Date: 2018-08-30 20:57+0200\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -403,37 +403,23 @@ "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes " "mutter default to layout logical monitors in a logical pixel coordinate " "space, while scaling monitor framebuffers instead of window content, to " -"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — " -"enables remote desktop support. To support remote desktop with screen " -"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables " -"screen cast support." -msgstr "" -"For at slå eksperimentelle funktioner til, skal du tilføje " -"funktionsnøgleordet til listen. Om funktionen kræver genstart af " -"kompositoren afhænger af den givne funktion. Der er ingen garanti for at " -"eksperimentelle funktion forbliver tilgængelige eller mulige at konfigurere. " -"Forvent ikke at noget i denne indstilling nødvendigvis fungerer i fremtiden. " -"Mulige nøgleord i øjeblikket: • “scale-monitor-framebuffer” — får mutter til " -"som standard at arrangere logiske skærme i et logisk pixelkoordinatrum, mens " -"skærmes framebuffere skaleres frem for vinduesindholdet for at håndtere " -"HiDPI-skærme. Fjernskrivebord med skærmdeling understøttes hvis “screen-" -"cast” også er aktiveret. • “screen-cast” — aktiverer understøttelse af " -"skærmoptagelse." +"manage HiDPI monitors. Does not require a restart." +msgstr "For at slå eksperimentelle funktioner til, skal du tilføje funktionsnøgleordet til listen. Om funktionen kræver genstart af kompositoren afhænger af den givne funktion. Der er ingen garanti for at eksperimentelle funktion forbliver tilgængelige eller mulige at konfigurere. Forvent ikke at noget i denne indstilling nødvendigvis fungerer i fremtiden. Mulige nøgleord i øjeblikket: • “scale-monitor-framebuffer” — får mutter til som standard at arrangere logiske skærme i et logisk pixelkoordinatrum, mens skærmes framebuffere skaleres frem for vinduesindholdet for at håndtere HiDPI-skærme. Kræver ikke genstart." -#: data/org.gnome.mutter.gschema.xml.in:145 +#: data/org.gnome.mutter.gschema.xml.in:141 msgid "Select window from tab popup" msgstr "Vælg vindue fra tab-pop-op" -#: data/org.gnome.mutter.gschema.xml.in:150 +#: data/org.gnome.mutter.gschema.xml.in:146 msgid "Cancel tab popup" msgstr "Annullér faneblads-pop-op" -#: data/org.gnome.mutter.gschema.xml.in:155 +#: data/org.gnome.mutter.gschema.xml.in:151 msgid "Switch monitor configurations" msgstr "Skift skærmkonfiguration" # Mærkelig ting at rotere. De mener nok at skifte cyclisk mellem nogle stykker, men "built-in"? -#: data/org.gnome.mutter.gschema.xml.in:160 +#: data/org.gnome.mutter.gschema.xml.in:156 msgid "Rotates the built-in monitor configuration" msgstr "Roterer den indbyggede skærmkonfiguration" @@ -500,7 +486,11 @@ "the client must also either send a specific X11 ClientMessage to the root " "window or be among the applications white-listed in key “xwayland-grab-" "access-rules”." -msgstr "Tillad tastaturindfangelse af X11-programmer, som kører i Xwayland. For at en X11-tastaturindfangelse behandles i Wayland, skal klienten også enten sende en specifik X11-ClientMessage til rodvinduet eller være blandt de godkendte programmer i nøglen “xwayland-grab-access-rules”." +msgstr "" +"Tillad tastaturindfangelse af X11-programmer, som kører i Xwayland. For at " +"en X11-tastaturindfangelse behandles i Wayland, skal klienten også enten " +"sende en specifik X11-ClientMessage til rodvinduet eller være blandt de " +"godkendte programmer i nøglen “xwayland-grab-access-rules”." #: data/org.gnome.mutter.wayland.gschema.xml.in:77 msgid "Xwayland applications allowed to issue keyboard grabs" @@ -518,12 +508,22 @@ "“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by " "using the specific keyboard shortcut defined by the keybinding key “restore-" "shortcuts”." -msgstr "Anfør navne på ressourcer eller ressourceklasser for X11-vinduer som tillades eller ikke tillades at udføre X11-tastaturindfangelse under Xwayland. Ressourcenavnet eller ressourceklassen for et givent X11-vindue kan findes med kommandoen “xprop WM_CLASS”. Værdierne understøtter jokertegnene “*” og “?”. Værdier som begynder med “!” forbydes, hvilket har præcedens over godkendelse, og dette tillader at fjerne programmer som ellers findes i systemets standardliste. Denne liste inkluderer følgende programmer: “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@”. Brugere kan afbryde en eksisterende indfangelse ved hjælp af den særlige tastaturgenvej defineret ved nøglen “restore-shortcuts”." +msgstr "" +"Anfør navne på ressourcer eller ressourceklasser for X11-vinduer som " +"tillades eller ikke tillades at udføre X11-tastaturindfangelse under " +"Xwayland. Ressourcenavnet eller ressourceklassen for et givent X11-vindue " +"kan findes med kommandoen “xprop WM_CLASS”. Værdierne understøtter " +"jokertegnene “*” og “?”. Værdier som begynder med “!” forbydes, hvilket har " +"præcedens over godkendelse, og dette tillader at fjerne programmer som " +"ellers findes i systemets standardliste. Denne liste inkluderer følgende " +"programmer: “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@”. Brugere kan afbryde en " +"eksisterende indfangelse ved hjælp af den særlige tastaturgenvej defineret " +"ved nøglen “restore-shortcuts”." #. TRANSLATORS: This string refers to a button that switches between #. * different modes. #. -#: src/backends/meta-input-settings.c:2260 +#: src/backends/meta-input-settings.c:2325 #, c-format msgid "Mode Switch (Group %d)" msgstr "Tilstandsskift (Gruppe %d)" @@ -531,30 +531,30 @@ #. TRANSLATORS: This string refers to an action, cycles drawing tablets' #. * mapping through the available outputs. #. -#: src/backends/meta-input-settings.c:2283 +#: src/backends/meta-input-settings.c:2348 msgid "Switch monitor" msgstr "Skift skærm" -#: src/backends/meta-input-settings.c:2285 +#: src/backends/meta-input-settings.c:2350 msgid "Show on-screen help" msgstr "Vis integreret hjælp" -#: src/backends/meta-monitor-manager.c:900 +#: src/backends/meta-monitor-manager.c:907 msgid "Built-in display" msgstr "Indbygget terminal" -#: src/backends/meta-monitor-manager.c:923 +#: src/backends/meta-monitor-manager.c:930 msgid "Unknown" msgstr "Ukendt" -#: src/backends/meta-monitor-manager.c:925 +#: src/backends/meta-monitor-manager.c:932 msgid "Unknown Display" msgstr "Ukendt terminal" #. TRANSLATORS: this is a monitor vendor name, followed by a #. * size in inches, like 'Dell 15"' #. -#: src/backends/meta-monitor-manager.c:933 +#: src/backends/meta-monitor-manager.c:940 #, c-format msgid "%s %s" msgstr "%s %s" @@ -568,66 +568,65 @@ msgstr "" "En anden komposithåndtering kører allerede på skærm %i på terminal “%s”." -#: src/core/bell.c:194 +#: src/core/bell.c:254 msgid "Bell event" msgstr "Bip-hændelse" -#: src/core/display.c:608 -#, c-format -msgid "Failed to open X Window System display “%s”\n" -msgstr "Kunne ikke åbne X Window System-terminalen “%s”\n" - -#: src/core/main.c:190 +#: src/core/main.c:191 msgid "Disable connection to session manager" msgstr "Deaktivér forbindelse til sessionshåndtering" -#: src/core/main.c:196 +#: src/core/main.c:197 msgid "Replace the running window manager" msgstr "Erstat den kørende vindueshåndtering" -#: src/core/main.c:202 +#: src/core/main.c:203 msgid "Specify session management ID" msgstr "Angiv sessionhåndterings-id" -#: src/core/main.c:207 +#: src/core/main.c:208 msgid "X Display to use" msgstr "X-terminal som bruges" -#: src/core/main.c:213 +#: src/core/main.c:214 msgid "Initialize session from savefile" msgstr "Initialisér session fra gemt fil" -#: src/core/main.c:219 +#: src/core/main.c:220 msgid "Make X calls synchronous" msgstr "Gør kald til X synkrone" -#: src/core/main.c:226 +#: src/core/main.c:227 msgid "Run as a wayland compositor" msgstr "Kør som en wayland-kompositor" -#: src/core/main.c:232 +#: src/core/main.c:233 msgid "Run as a nested compositor" msgstr "Kør som en indlejret kompositor" -#: src/core/main.c:240 +#: src/core/main.c:239 +msgid "Run wayland compositor without starting Xwayland" +msgstr "Kør wayland-kompositoren uden at starte Xwayland" + +#: src/core/main.c:247 msgid "Run as a full display server, rather than nested" msgstr "Kør som fuld terminalserver, frem for indlejret" -#: src/core/main.c:246 +#: src/core/main.c:253 msgid "Run with X11 backend" msgstr "Kør med X11-motor" #. Translators: %s is a window title -#: src/core/meta-close-dialog-default.c:147 +#: src/core/meta-close-dialog-default.c:148 #, c-format msgid "“%s” is not responding." msgstr "“%s” svarer ikke." -#: src/core/meta-close-dialog-default.c:149 +#: src/core/meta-close-dialog-default.c:150 msgid "Application is not responding." msgstr "Program svarer ikke." -#: src/core/meta-close-dialog-default.c:154 +#: src/core/meta-close-dialog-default.c:155 msgid "" "You may choose to wait a short while for it to continue or force the " "application to quit entirely." @@ -635,11 +634,11 @@ "Du kan vælge at vente et lille stykke tid på at programmet fortsætter, eller " "du kan tvinge programmet til at afslutte fuldstændigt." -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Force Quit" msgstr "_Tving til at afslutte" -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Wait" msgstr "_Vent" @@ -666,12 +665,21 @@ msgid "Mutter plugin to use" msgstr "Mutter-udvidelsesmodul der skal bruges" -#: src/core/prefs.c:1997 +#: src/core/prefs.c:1915 #, c-format msgid "Workspace %d" msgstr "Arbejdsområde %d" -#: src/core/screen.c:583 +#: src/core/util.c:120 +msgid "Mutter was compiled without support for verbose mode\n" +msgstr "Mutter blev kompileret uden understøttelse for uddybende tilstand\n" + +#: src/wayland/meta-wayland-tablet-pad.c:567 +#, c-format +msgid "Mode Switch: Mode %d" +msgstr "Tilstandsskift: Tilstand %d" + +#: src/x11/meta-x11-display.c:666 #, c-format msgid "" "Display “%s” already has a window manager; try using the --replace option to " @@ -680,21 +688,21 @@ "Terminalen “%s” har allerede en vindueshåndtering; prøv tilvalget --replace " "for at erstatte den aktuelle vindueshåndtering." -#: src/core/screen.c:668 -#, c-format -msgid "Screen %d on display “%s” is invalid\n" -msgstr "Skærm %d på terminal “%s” er ugyldig\n" +#: src/x11/meta-x11-display.c:1010 +msgid "Failed to initialize GDK\n" +msgstr "Kunne ikke klargøre GDK\n" -#: src/core/util.c:120 -msgid "Mutter was compiled without support for verbose mode\n" -msgstr "Mutter blev kompileret uden understøttelse for uddybende tilstand\n" +#: src/x11/meta-x11-display.c:1034 +#, c-format +msgid "Failed to open X Window System display “%s”\n" +msgstr "Kunne ikke åbne X Window System-terminalen “%s”\n" -#: src/wayland/meta-wayland-tablet-pad.c:563 +#: src/x11/meta-x11-display.c:1117 #, c-format -msgid "Mode Switch: Mode %d" -msgstr "Tilstandsskift: Tilstand %d" +msgid "Screen %d on display “%s” is invalid\n" +msgstr "Skærm %d på terminal “%s” er ugyldig\n" -#: src/x11/session.c:1818 +#: src/x11/session.c:1819 msgid "" "These windows do not support “save current setup” and will have to be " "restarted manually next time you log in." @@ -703,7 +711,7 @@ "manuelt næste gang, du logger på." # Lad os håbe dette er rigtigt -#: src/x11/window-props.c:559 +#: src/x11/window-props.c:565 #, c-format msgid "%s (on %s)" msgstr "%s (på %s)" Binary files /tmp/tmpHdBE7h/ig91FQ4feh/mutter-3.29.92/po/gl.gmo and /tmp/tmpHdBE7h/kIMnP3Mfas/mutter-3.30.0/po/gl.gmo differ diff -Nru mutter-3.29.92/po/gl.po mutter-3.30.0/po/gl.po --- mutter-3.29.92/po/gl.po 2018-08-10 16:59:10.000000000 +0000 +++ mutter-3.30.0/po/gl.po 2018-09-03 22:05:08.000000000 +0000 @@ -14,16 +14,16 @@ msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n" -"POT-Creation-Date: 2018-03-03 13:19+0000\n" -"PO-Revision-Date: 2018-05-07 19:37+0200\n" -"Last-Translator: marcos \n" -"Language-Team: Galician\n" +"POT-Creation-Date: 2018-08-26 03:59+0000\n" +"PO-Revision-Date: 2018-08-30 00:18+0200\n" +"Last-Translator: Fran Dieguez \n" +"Language-Team: Proxecto Trasno \n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" #: data/50-mutter-navigation.xml:6 @@ -394,6 +394,18 @@ msgstr "Activar as características experimentais" #: data/org.gnome.mutter.gschema.xml.in:108 +#| msgid "" +#| "To enable experimental features, add the feature keyword to the list. " +#| "Whether the feature requires restarting the compositor depends on the " +#| "given feature. Any experimental feature is not required to still be " +#| "available, or configurable. Don’t expect adding anything in this setting " +#| "to be future proof. Currently possible keywords: • “scale-monitor-" +#| "framebuffer” — makes mutter default to layout logical monitors in a " +#| "logical pixel coordinate space, while scaling monitor framebuffers " +#| "instead of window content, to manage HiDPI monitors. Does not require a " +#| "restart. • “remote-desktop” — enables remote desktop support. To support " +#| "remote desktop with screen sharing, “screen-cast” must also be enabled. • " +#| "“screen-cast” — enables screen cast support." msgid "" "To enable experimental features, add the feature keyword to the list. " "Whether the feature requires restarting the compositor depends on the given " @@ -402,10 +414,7 @@ "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes " "mutter default to layout logical monitors in a logical pixel coordinate " "space, while scaling monitor framebuffers instead of window content, to " -"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — " -"enables remote desktop support. To support remote desktop with screen " -"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables " -"screen cast support." +"manage HiDPI monitors. Does not require a restart." msgstr "" "Para activar as características experimentais, engada a palabra chave da " "característica á lista. Depende da característica que se deba reiniciar ou " @@ -415,25 +424,21 @@ "son: «scale-monitor-framebuffer» — fai que mutter de maneira predeterminada " "dispoña os monitores lóxicos nun espacio lóxico de coordenadas de píxeles, " "mentres escala framebuffers de monitores no lugar do contido de xanela, para " -"administrar monitores HiDPI. Non require un reinicio. «remote-desktop» — " -"permite a compatibilidade con compartición de pantalla. Para admitir o " -"escritorio remoto con compartición de pantalla tamén debe activar «screen-" -"cast». • «screen-cast» — permite a compatibilidade coa retransmisión de " -"pantalla." +"administrar monitores HiDPI. Non require un reinicio." -#: data/org.gnome.mutter.gschema.xml.in:145 +#: data/org.gnome.mutter.gschema.xml.in:141 msgid "Select window from tab popup" msgstr "Seleccionar xanela da lapela emerxente" -#: data/org.gnome.mutter.gschema.xml.in:150 +#: data/org.gnome.mutter.gschema.xml.in:146 msgid "Cancel tab popup" msgstr "Cancelar lapela emerxente" -#: data/org.gnome.mutter.gschema.xml.in:155 +#: data/org.gnome.mutter.gschema.xml.in:151 msgid "Switch monitor configurations" msgstr "Cambiar preferencias do monitor" -#: data/org.gnome.mutter.gschema.xml.in:160 +#: data/org.gnome.mutter.gschema.xml.in:156 msgid "Rotates the built-in monitor configuration" msgstr "Rota a configuración do monitor embebido" @@ -554,22 +559,22 @@ msgid "Show on-screen help" msgstr "Mostrar axuda en pantalla" -#: src/backends/meta-monitor-manager.c:900 +#: src/backends/meta-monitor-manager.c:886 msgid "Built-in display" msgstr "Pantalla embebida" -#: src/backends/meta-monitor-manager.c:923 +#: src/backends/meta-monitor-manager.c:909 msgid "Unknown" msgstr "Descoñecido" -#: src/backends/meta-monitor-manager.c:925 +#: src/backends/meta-monitor-manager.c:911 msgid "Unknown Display" msgstr "Pantalla descoñecida" #. TRANSLATORS: this is a monitor vendor name, followed by a #. * size in inches, like 'Dell 15"' #. -#: src/backends/meta-monitor-manager.c:933 +#: src/backends/meta-monitor-manager.c:919 #, c-format msgid "%s %s" msgstr "%s %s" @@ -584,66 +589,65 @@ "Xa se está a executar outro xestor de composición na pantalla %i na " "visualización «%s»." -#: src/core/bell.c:194 +#: src/core/bell.c:254 msgid "Bell event" msgstr "Evento de campá" -#: src/core/display.c:608 -#, c-format -msgid "Failed to open X Window System display “%s”\n" -msgstr "Produciuse un erro ao abrir a visualización do X Window System «%s»\n" - -#: src/core/main.c:190 +#: src/core/main.c:191 msgid "Disable connection to session manager" msgstr "Desactivar a conexión ao xestor de sesión" -#: src/core/main.c:196 +#: src/core/main.c:197 msgid "Replace the running window manager" msgstr "Substituír o xestor de xanelas en execución" -#: src/core/main.c:202 +#: src/core/main.c:203 msgid "Specify session management ID" msgstr "Especificar o ID de xestión de sesión" -#: src/core/main.c:207 +#: src/core/main.c:208 msgid "X Display to use" msgstr "Pantalla X que se vai usar" -#: src/core/main.c:213 +#: src/core/main.c:214 msgid "Initialize session from savefile" msgstr "Inicializar sesión desde o ficheiro de salvagarda" -#: src/core/main.c:219 +#: src/core/main.c:220 msgid "Make X calls synchronous" msgstr "Facer que as chamadas a X sexan sincrónicas" -#: src/core/main.c:226 +#: src/core/main.c:227 msgid "Run as a wayland compositor" msgstr "Executar como compositor de wayland" -#: src/core/main.c:232 +#: src/core/main.c:233 msgid "Run as a nested compositor" msgstr "Executar como compositor anidado" -#: src/core/main.c:240 +#: src/core/main.c:239 +msgid "Run wayland compositor without starting Xwayland" +msgstr "Executar o compositor de wayland sen iniciar Xwayland" + +#: src/core/main.c:247 msgid "Run as a full display server, rather than nested" msgstr "Executar como un servidor de pantalla completo, fronte a un aniñado" -#: src/core/main.c:246 +#: src/core/main.c:253 msgid "Run with X11 backend" msgstr "Executar coa infraestructura de X11" #. Translators: %s is a window title -#: src/core/meta-close-dialog-default.c:147 +#: src/core/meta-close-dialog-default.c:148 #, c-format msgid "“%s” is not responding." msgstr "«%s» non está respondendo." -#: src/core/meta-close-dialog-default.c:149 +#: src/core/meta-close-dialog-default.c:150 msgid "Application is not responding." msgstr "O Aplicativo non está respondendo." -#: src/core/meta-close-dialog-default.c:154 +#: src/core/meta-close-dialog-default.c:155 msgid "" "You may choose to wait a short while for it to continue or force the " "application to quit entirely." @@ -651,11 +655,11 @@ "Pode elixir esperar un momento para ver se continúa ou forzar ao aplicativo " "a pechar completamente." -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Force Quit" msgstr "_Forzar a saída" -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Wait" msgstr "Espe_rar" @@ -682,12 +686,21 @@ msgid "Mutter plugin to use" msgstr "Engadido de mutter que usar" -#: src/core/prefs.c:1997 +#: src/core/prefs.c:1787 #, c-format msgid "Workspace %d" msgstr "Espazo de traballo %d" -#: src/core/screen.c:583 +#: src/core/util.c:120 +msgid "Mutter was compiled without support for verbose mode\n" +msgstr "Mutter foi compilado sen compatibilidade para o modo detallado\n" + +#: src/wayland/meta-wayland-tablet-pad.c:567 +#, c-format +msgid "Mode Switch: Mode %d" +msgstr "Modo conmutador: Modo %d" + +#: src/x11/meta-x11-display.c:666 #, c-format msgid "" "Display “%s” already has a window manager; try using the --replace option to " @@ -696,21 +709,21 @@ "A pantalla «%s» ten xa un xestor de xanelas, tente usar a opción --replace " "para substituír o xestor de xanelas." -#: src/core/screen.c:668 -#, c-format -msgid "Screen %d on display “%s” is invalid\n" -msgstr "A pantalla %d na visualización «%s» non é válida\n" +#: src/x11/meta-x11-display.c:1010 +msgid "Failed to initialize GDK\n" +msgstr "Procuciuse un fallo ao inicializar GDK\n" -#: src/core/util.c:120 -msgid "Mutter was compiled without support for verbose mode\n" -msgstr "Mutter foi compilado sen compatibilidade para o modo detallado\n" +#: src/x11/meta-x11-display.c:1034 +#, c-format +msgid "Failed to open X Window System display “%s”\n" +msgstr "Produciuse un erro ao abrir a visualización do X Window System «%s»\n" -#: src/wayland/meta-wayland-tablet-pad.c:567 +#: src/x11/meta-x11-display.c:1117 #, c-format -msgid "Mode Switch: Mode %d" -msgstr "Modo conmutador: Modo %d" +msgid "Screen %d on display “%s” is invalid\n" +msgstr "A pantalla %d na visualización «%s» non é válida\n" -#: src/x11/session.c:1818 +#: src/x11/session.c:1819 msgid "" "These windows do not support “save current setup” and will have to be " "restarted manually next time you log in." @@ -718,7 +731,7 @@ "Estas xanelas non soportan «save current setup» e terán que reiniciarse " "manualmente a próxima vez que inicie a sesión." -#: src/x11/window-props.c:559 +#: src/x11/window-props.c:565 #, c-format msgid "%s (on %s)" msgstr "%s (en %s)" Binary files /tmp/tmpHdBE7h/ig91FQ4feh/mutter-3.29.92/po/hr.gmo and /tmp/tmpHdBE7h/kIMnP3Mfas/mutter-3.30.0/po/hr.gmo differ diff -Nru mutter-3.29.92/po/hr.po mutter-3.30.0/po/hr.po --- mutter-3.29.92/po/hr.po 2018-08-10 16:59:10.000000000 +0000 +++ mutter-3.30.0/po/hr.po 2018-09-03 22:05:08.000000000 +0000 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: metacity 0\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n" -"POT-Creation-Date: 2018-02-06 04:14+0000\n" -"PO-Revision-Date: 2018-02-17 16:00+0100\n" +"POT-Creation-Date: 2018-07-07 09:58+0000\n" +"PO-Revision-Date: 2018-09-02 18:40+0200\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -16,7 +16,7 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Launchpad-Export-Date: 2008-05-28 13:28+0000\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.1.1\n" #: data/50-mutter-navigation.xml:6 msgid "Navigation" @@ -390,10 +390,7 @@ "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes " "mutter default to layout logical monitors in a logical pixel coordinate " "space, while scaling monitor framebuffers instead of window content, to " -"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — " -"enables remote desktop support. To support remote desktop with screen " -"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables " -"screen cast support." +"manage HiDPI monitors. Does not require a restart." msgstr "" "Za omogućavanje eksperimentalnih značajki, dodajte ključnu riječ značajke na " "popis. Zahtijeva li značajka ponovno pokretanje kompozitora ovisi o zadanoj " @@ -402,25 +399,22 @@ "ovu postavku za budući dokaz. Trenutne dostupne ključne riječi: • “scale-" "monitor-framebuffer” — čini mutter zadanim izlazu logičkih zaslona u " "logičnom koordinatnom prostoru piksela, dok međuspremnik okvira mijenja " -"veličinu zaslona umjesto sadržaja prozora, upravlja kako bi upravljao " -"(HiDPI) zaslonima visoke razlučivosti. Ne zahtijeva ponovno pokretanje. • " -"“remote-desktop” — omogućava podršku za udaljene radne površine. Za podršku " -"udaljene radne površine s dijeljenjem zaslona, “screen-cast” mora isto biti " -"omogućen. • “screen-cast” — omogućuje podršku emitiranja zaslona." +"veličinu zaslona umjesto sadržaja prozora, kako bi upravljao (HiDPI) " +"zaslonima visoke razlučivosti. Ne zahtijeva ponovno pokretanje." -#: data/org.gnome.mutter.gschema.xml.in:145 +#: data/org.gnome.mutter.gschema.xml.in:141 msgid "Select window from tab popup" msgstr "Odaberi prozor iz skočnog prozora" -#: data/org.gnome.mutter.gschema.xml.in:150 +#: data/org.gnome.mutter.gschema.xml.in:146 msgid "Cancel tab popup" msgstr "Prekini skočni prozor" -#: data/org.gnome.mutter.gschema.xml.in:155 +#: data/org.gnome.mutter.gschema.xml.in:151 msgid "Switch monitor configurations" msgstr "Prebacivanje podešavanja zaslona" -#: data/org.gnome.mutter.gschema.xml.in:160 +#: data/org.gnome.mutter.gschema.xml.in:156 msgid "Rotates the built-in monitor configuration" msgstr "Rotiraj ugrađeno podešavanje zaslona" @@ -524,7 +518,7 @@ #. TRANSLATORS: This string refers to a button that switches between #. * different modes. #. -#: src/backends/meta-input-settings.c:2260 +#: src/backends/meta-input-settings.c:2325 #, c-format msgid "Mode Switch (Group %d)" msgstr "Način prebacivanja (Grupa %d)" @@ -532,30 +526,30 @@ #. TRANSLATORS: This string refers to an action, cycles drawing tablets' #. * mapping through the available outputs. #. -#: src/backends/meta-input-settings.c:2283 +#: src/backends/meta-input-settings.c:2348 msgid "Switch monitor" msgstr "Prebaci zaslon" -#: src/backends/meta-input-settings.c:2285 +#: src/backends/meta-input-settings.c:2350 msgid "Show on-screen help" msgstr "Prikaži zaslonsku pomoć" -#: src/backends/meta-monitor-manager.c:900 +#: src/backends/meta-monitor-manager.c:907 msgid "Built-in display" msgstr "Ugrađeni zaslon" -#: src/backends/meta-monitor-manager.c:923 +#: src/backends/meta-monitor-manager.c:930 msgid "Unknown" msgstr "Nepoznat" -#: src/backends/meta-monitor-manager.c:925 +#: src/backends/meta-monitor-manager.c:932 msgid "Unknown Display" msgstr "Nepoznat zaslon" #. TRANSLATORS: this is a monitor vendor name, followed by a #. * size in inches, like 'Dell 15"' #. -#: src/backends/meta-monitor-manager.c:933 +#: src/backends/meta-monitor-manager.c:940 #, c-format msgid "%s %s" msgstr "%s %s" @@ -569,66 +563,65 @@ msgstr "" "Drugi upravitelja kompoziranja već je pokrenut na zaslonu %i prikaza \"%s\"." -#: src/core/bell.c:194 +#: src/core/bell.c:254 msgid "Bell event" msgstr "Događaj zvona" -#: src/core/display.c:608 -#, c-format -msgid "Failed to open X Window System display “%s”\n" -msgstr "Neuspjelo otvaranje sustava prikaza X prozora \"%s\"\n" - -#: src/core/main.c:190 +#: src/core/main.c:191 msgid "Disable connection to session manager" msgstr "Onemogući povezivanje sa upraviteljem sesija" -#: src/core/main.c:196 +#: src/core/main.c:197 msgid "Replace the running window manager" msgstr "Zamijeni pokrenutoga upravitelja porozora" -#: src/core/main.c:202 +#: src/core/main.c:203 msgid "Specify session management ID" msgstr "Odredite ID upravljanja sesijama" -#: src/core/main.c:207 +#: src/core/main.c:208 msgid "X Display to use" msgstr "X Prikaz za korištenje" -#: src/core/main.c:213 +#: src/core/main.c:214 msgid "Initialize session from savefile" msgstr "Pokreni sesiju iz spremljene datoteke" -#: src/core/main.c:219 +#: src/core/main.c:220 msgid "Make X calls synchronous" msgstr "Napravi X pozive usklađenim" -#: src/core/main.c:226 +#: src/core/main.c:227 msgid "Run as a wayland compositor" msgstr "Pokreni wayland kompozitor" -#: src/core/main.c:232 +#: src/core/main.c:233 msgid "Run as a nested compositor" msgstr "Pokreni kao ugrađeni kompozitor" -#: src/core/main.c:240 +#: src/core/main.c:239 +msgid "Run wayland compositor without starting Xwayland" +msgstr "Pokreni wayland kompozitor bez pokretanja Xwaylanda" + +#: src/core/main.c:247 msgid "Run as a full display server, rather than nested" msgstr "Pokreni kao potpuni poslužitelj zaslona, radije nego ugrađeni" -#: src/core/main.c:246 +#: src/core/main.c:253 msgid "Run with X11 backend" msgstr "Pokreni s X11 pozadinskim programom" #. Translators: %s is a window title -#: src/core/meta-close-dialog-default.c:147 +#: src/core/meta-close-dialog-default.c:148 #, c-format msgid "“%s” is not responding." msgstr "“%s” ne odgovara." -#: src/core/meta-close-dialog-default.c:149 +#: src/core/meta-close-dialog-default.c:150 msgid "Application is not responding." msgstr "Aplikacija ne odgovara." -#: src/core/meta-close-dialog-default.c:154 +#: src/core/meta-close-dialog-default.c:155 msgid "" "You may choose to wait a short while for it to continue or force the " "application to quit entirely." @@ -636,11 +629,11 @@ "Možete pričekati neko vrijeme da aplikacija nastavi s radom ili možete " "prisiliti prekid rada aplikacije." -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Force Quit" msgstr "_Prisili izlaženje" -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Wait" msgstr "_Čekaj" @@ -667,12 +660,21 @@ msgid "Mutter plugin to use" msgstr "Mutter priključak koji se koristi" -#: src/core/prefs.c:1997 +#: src/core/prefs.c:1915 #, c-format msgid "Workspace %d" msgstr "Radni prostor %d" -#: src/core/screen.c:583 +#: src/core/util.c:120 +msgid "Mutter was compiled without support for verbose mode\n" +msgstr "Mutter je kompiliran bez podrške za opširan način rada\n" + +#: src/wayland/meta-wayland-tablet-pad.c:567 +#, c-format +msgid "Mode Switch: Mode %d" +msgstr "Način prebacivanja: Način %d" + +#: src/x11/meta-x11-display.c:666 #, c-format msgid "" "Display “%s” already has a window manager; try using the --replace option to " @@ -681,21 +683,21 @@ "Prikaz \"%s\" već ima upravitelja prozora; pokušajte koristiti --replace " "mogućnost za zamjenu trenutnog upravitelja prozora." -#: src/core/screen.c:668 -#, c-format -msgid "Screen %d on display “%s” is invalid\n" -msgstr "Zaslon %d na prikazu '%s' je neispravan\n" +#: src/x11/meta-x11-display.c:1010 +msgid "Failed to initialize GDK\n" +msgstr "Neuspjelo GDK pokretanje\n" -#: src/core/util.c:120 -msgid "Mutter was compiled without support for verbose mode\n" -msgstr "Mutter je kompiliran bez podrške za opširan način rada\n" +#: src/x11/meta-x11-display.c:1034 +#, c-format +msgid "Failed to open X Window System display “%s”\n" +msgstr "Neuspjelo otvaranje sustava prikaza X prozora \"%s\"\n" -#: src/wayland/meta-wayland-tablet-pad.c:563 +#: src/x11/meta-x11-display.c:1117 #, c-format -msgid "Mode Switch: Mode %d" -msgstr "Način prebacivanja: Način %d" +msgid "Screen %d on display “%s” is invalid\n" +msgstr "Zaslon %d na prikazu '%s' je neispravan\n" -#: src/x11/session.c:1818 +#: src/x11/session.c:1819 msgid "" "These windows do not support “save current setup” and will have to be " "restarted manually next time you log in." @@ -703,7 +705,7 @@ "Ovi prozori ne podržavaju mogućnost \"spremi trenutne postavke\" i moraju se " "ručno ponovno pokrenuti sljedeći puta kada se prijavite." -#: src/x11/window-props.c:559 +#: src/x11/window-props.c:565 #, c-format msgid "%s (on %s)" msgstr "%s (na %s)" Binary files /tmp/tmpHdBE7h/ig91FQ4feh/mutter-3.29.92/po/hu.gmo and /tmp/tmpHdBE7h/kIMnP3Mfas/mutter-3.30.0/po/hu.gmo differ diff -Nru mutter-3.29.92/po/hu.po mutter-3.30.0/po/hu.po --- mutter-3.29.92/po/hu.po 2018-08-10 16:59:10.000000000 +0000 +++ mutter-3.30.0/po/hu.po 2018-09-03 22:05:08.000000000 +0000 @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: mutter master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n" -"POT-Creation-Date: 2018-02-07 18:39+0000\n" -"PO-Revision-Date: 2018-02-23 23:53+0100\n" -"Last-Translator: Balázs Úr \n" +"POT-Creation-Date: 2018-07-07 09:58+0000\n" +"PO-Revision-Date: 2018-08-31 13:00+0200\n" +"Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Poedit 2.0.8\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: data/50-mutter-navigation.xml:6 @@ -395,10 +395,7 @@ "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes " "mutter default to layout logical monitors in a logical pixel coordinate " "space, while scaling monitor framebuffers instead of window content, to " -"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — " -"enables remote desktop support. To support remote desktop with screen " -"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables " -"screen cast support." +"manage HiDPI monitors. Does not require a restart." msgstr "" "A kísérleti funkciók engedélyezéséhez adja hozzá a funkció kulcsszavát a " "listához. A funkció a betűszedő újraindítását igényelheti az adott " @@ -409,24 +406,21 @@ "teszi a mutter programot a logikai monitorok elrendezéséhez egy logikai " "képpontkoordináta-térben, miközben átméretezi a monitor keretpufferét az " "ablaktartalom helyett azért, hogy kezelje a HiDPI monitorokat. Nem igényel " -"újraindítást. • „remote-desktop” — engedélyezi a távoli asztal támogatást. A " -"távoli asztal képernyőmegosztással való támogatásához a „screen-cast” " -"funkciónak is engedélyezve kell lennie. • „screen-cast” — engedélyezi a " -"képernyőrögzítés támogatását." +"újraindítást." -#: data/org.gnome.mutter.gschema.xml.in:145 +#: data/org.gnome.mutter.gschema.xml.in:141 msgid "Select window from tab popup" msgstr "Ablakok kiválasztása tab billentyűre felugró ablakból" -#: data/org.gnome.mutter.gschema.xml.in:150 +#: data/org.gnome.mutter.gschema.xml.in:146 msgid "Cancel tab popup" msgstr "Tab felugró kikapcsolása" -#: data/org.gnome.mutter.gschema.xml.in:155 +#: data/org.gnome.mutter.gschema.xml.in:151 msgid "Switch monitor configurations" msgstr "Monitorkonfiguráció átváltása" -#: data/org.gnome.mutter.gschema.xml.in:160 +#: data/org.gnome.mutter.gschema.xml.in:156 msgid "Rotates the built-in monitor configuration" msgstr "Cserélgeti a beépített monitorkonfigurációkat" @@ -531,7 +525,7 @@ #. TRANSLATORS: This string refers to a button that switches between #. * different modes. #. -#: src/backends/meta-input-settings.c:2260 +#: src/backends/meta-input-settings.c:2325 #, c-format msgid "Mode Switch (Group %d)" msgstr "Módkapcsoló (%d. csoport)" @@ -539,30 +533,30 @@ #. TRANSLATORS: This string refers to an action, cycles drawing tablets' #. * mapping through the available outputs. #. -#: src/backends/meta-input-settings.c:2283 +#: src/backends/meta-input-settings.c:2348 msgid "Switch monitor" msgstr "Monitorváltás" -#: src/backends/meta-input-settings.c:2285 +#: src/backends/meta-input-settings.c:2350 msgid "Show on-screen help" msgstr "Képernyősúgó megjelenítése" -#: src/backends/meta-monitor-manager.c:900 +#: src/backends/meta-monitor-manager.c:907 msgid "Built-in display" msgstr "Beépített kijelző" -#: src/backends/meta-monitor-manager.c:923 +#: src/backends/meta-monitor-manager.c:930 msgid "Unknown" msgstr "Ismeretlen" -#: src/backends/meta-monitor-manager.c:925 +#: src/backends/meta-monitor-manager.c:932 msgid "Unknown Display" msgstr "Ismeretlen kijelző" #. TRANSLATORS: this is a monitor vendor name, followed by a #. * size in inches, like 'Dell 15"' #. -#: src/backends/meta-monitor-manager.c:933 +#: src/backends/meta-monitor-manager.c:940 #, c-format msgid "%s %s" msgstr "%s %s" @@ -577,67 +571,66 @@ "Már fut egy másik kompozitálás-kezelő a(z) %i. képernyőn a(z) „%s” " "megjelenítőn." -#: src/core/bell.c:194 +#: src/core/bell.c:254 msgid "Bell event" msgstr "Csengetés esemény" -#: src/core/display.c:608 -#, c-format -msgid "Failed to open X Window System display “%s”\n" -msgstr "Nem sikerült megnyitni a(z) „%s” X Window rendszer képernyőt\n" - -#: src/core/main.c:190 +#: src/core/main.c:191 msgid "Disable connection to session manager" msgstr "A munkamenet-kezelőhöz való csatlakozás tiltása" -#: src/core/main.c:196 +#: src/core/main.c:197 msgid "Replace the running window manager" msgstr "A futó ablakkezelő helyettesítése" -#: src/core/main.c:202 +#: src/core/main.c:203 msgid "Specify session management ID" msgstr "A munkamenet-kezelő azonosítójának megadása" -#: src/core/main.c:207 +#: src/core/main.c:208 msgid "X Display to use" msgstr "A használandó X megjelenítő" -#: src/core/main.c:213 +#: src/core/main.c:214 msgid "Initialize session from savefile" msgstr "A munkamenet előkészítése a mentési fájlból" -#: src/core/main.c:219 +#: src/core/main.c:220 msgid "Make X calls synchronous" msgstr "Az X-hívások szinkronná tétele" -#: src/core/main.c:226 +#: src/core/main.c:227 msgid "Run as a wayland compositor" msgstr "Futtatás wayland betűszedőként" -#: src/core/main.c:232 +#: src/core/main.c:233 msgid "Run as a nested compositor" msgstr "Futtatás beágyazott betűszedőként" -#: src/core/main.c:240 +#: src/core/main.c:239 +msgid "Run wayland compositor without starting Xwayland" +msgstr "Wayland kompozitáló futtatása az Xwayland elíntása nélkül" + +#: src/core/main.c:247 msgid "Run as a full display server, rather than nested" msgstr "" "Futtatás teljes megjelenítő kiszolgálóként az egymásba ágyazott helyett" -#: src/core/main.c:246 +#: src/core/main.c:253 msgid "Run with X11 backend" msgstr "Futtatás X11 háttérprogrammal" #. Translators: %s is a window title -#: src/core/meta-close-dialog-default.c:147 +#: src/core/meta-close-dialog-default.c:148 #, c-format msgid "“%s” is not responding." msgstr "„%s” nem válaszol." -#: src/core/meta-close-dialog-default.c:149 +#: src/core/meta-close-dialog-default.c:150 msgid "Application is not responding." msgstr "Az alkalmazás nem válaszol." -#: src/core/meta-close-dialog-default.c:154 +#: src/core/meta-close-dialog-default.c:155 msgid "" "You may choose to wait a short while for it to continue or force the " "application to quit entirely." @@ -645,11 +638,11 @@ "Várhat egy kicsit a folytatódására, vagy kikényszerítheti az alkalmazás " "teljes kilépését." -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Force Quit" msgstr "_Erőltetett kilépés" -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Wait" msgstr "Vá_rakozás" @@ -676,12 +669,21 @@ msgid "Mutter plugin to use" msgstr "Használandó Mutter bővítmény" -#: src/core/prefs.c:1997 +#: src/core/prefs.c:1915 #, c-format msgid "Workspace %d" msgstr "%d. munkaterület" -#: src/core/screen.c:583 +#: src/core/util.c:120 +msgid "Mutter was compiled without support for verbose mode\n" +msgstr "A Mutter ablakkezelőt a részletes mód támogatása nélkül fordították\n" + +#: src/wayland/meta-wayland-tablet-pad.c:567 +#, c-format +msgid "Mode Switch: Mode %d" +msgstr "Módkapcsoló: %d. mód" + +#: src/x11/meta-x11-display.c:666 #, c-format msgid "" "Display “%s” already has a window manager; try using the --replace option to " @@ -690,21 +692,21 @@ "A(z) „%s” kijelző már rendelkezik ablakkezelővel; próbálja a --replace " "kapcsolóval helyettesíteni a jelenlegi ablakkezelőt." -#: src/core/screen.c:668 -#, c-format -msgid "Screen %d on display “%s” is invalid\n" -msgstr "A(z) %d. képernyő a(z) „%s” megjelenítőn érvénytelen\n" +#: src/x11/meta-x11-display.c:1010 +msgid "Failed to initialize GDK\n" +msgstr "A GDK előkészítése meghiúsult\n" -#: src/core/util.c:120 -msgid "Mutter was compiled without support for verbose mode\n" -msgstr "A Mutter ablakkezelőt a részletes mód támogatása nélkül fordították\n" +#: src/x11/meta-x11-display.c:1034 +#, c-format +msgid "Failed to open X Window System display “%s”\n" +msgstr "Nem sikerült megnyitni a(z) „%s” X Window rendszer képernyőt\n" -#: src/wayland/meta-wayland-tablet-pad.c:563 +#: src/x11/meta-x11-display.c:1117 #, c-format -msgid "Mode Switch: Mode %d" -msgstr "Módkapcsoló: %d. mód" +msgid "Screen %d on display “%s” is invalid\n" +msgstr "A(z) %d. képernyő a(z) „%s” megjelenítőn érvénytelen\n" -#: src/x11/session.c:1818 +#: src/x11/session.c:1819 msgid "" "These windows do not support “save current setup” and will have to be " "restarted manually next time you log in." @@ -712,8 +714,7 @@ "Az alábbi ablakok nem támogatják az „aktuális beállítások mentését”, emiatt " "ezeket a legközelebbi bejelentkezéskor manuálisan újra kell indítania." -#: src/x11/window-props.c:559 +#: src/x11/window-props.c:565 #, c-format msgid "%s (on %s)" msgstr "%s (ezen: %s)" - Binary files /tmp/tmpHdBE7h/ig91FQ4feh/mutter-3.29.92/po/lv.gmo and /tmp/tmpHdBE7h/kIMnP3Mfas/mutter-3.30.0/po/lv.gmo differ diff -Nru mutter-3.29.92/po/lv.po mutter-3.30.0/po/lv.po --- mutter-3.29.92/po/lv.po 2018-08-10 16:59:10.000000000 +0000 +++ mutter-3.30.0/po/lv.po 2018-09-03 22:05:08.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n" -"POT-Creation-Date: 2018-02-06 04:14+0000\n" -"PO-Revision-Date: 2018-02-25 15:45+0200\n" +"POT-Creation-Date: 2018-07-07 09:58+0000\n" +"PO-Revision-Date: 2018-08-31 20:55+0200\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -388,6 +388,18 @@ msgstr "Ieslēgt eksperimentālās iespējas" #: data/org.gnome.mutter.gschema.xml.in:108 +#| msgid "" +#| "To enable experimental features, add the feature keyword to the list. " +#| "Whether the feature requires restarting the compositor depends on the " +#| "given feature. Any experimental feature is not required to still be " +#| "available, or configurable. Don’t expect adding anything in this setting " +#| "to be future proof. Currently possible keywords: • “scale-monitor-" +#| "framebuffer” — makes mutter default to layout logical monitors in a " +#| "logical pixel coordinate space, while scaling monitor framebuffers " +#| "instead of window content, to manage HiDPI monitors. Does not require a " +#| "restart. • “remote-desktop” — enables remote desktop support. To support " +#| "remote desktop with screen sharing, “screen-cast” must also be enabled. • " +#| "“screen-cast” — enables screen cast support." msgid "" "To enable experimental features, add the feature keyword to the list. " "Whether the feature requires restarting the compositor depends on the given " @@ -396,36 +408,31 @@ "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes " "mutter default to layout logical monitors in a logical pixel coordinate " "space, while scaling monitor framebuffers instead of window content, to " -"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — " -"enables remote desktop support. To support remote desktop with screen " -"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables " -"screen cast support." -msgstr "" -"Lai ieslēgtu eksperimentālās iespējas, pievienojiet iespējas atslēgvārdu " -"sarakstam. Vai iespējai būs nepieciešama kompozitora pārstartēšana, būs " -"atkarīga no dotās iespējas. Jebkura eksperimentāla iespēja var būt " -"nepieejama vai nekonfigurējama. Negaidiet, ka jebkura no šīm iespējām " -"nākotnē strādās. Pašlaik pieejamie atslēgvārdi: • “scale-monitor-" -"framebuffer” — liek mutter pēc noklusējuma izkārtot loģiskos monitorus " -"loģisko pikseļu koordināšu telpā, kamēr mērogo monitora kadru buferus, nevis " -"loga saturu, lai pārvaldītu HiDPI monitorus. Pārstartēšana nav nepieciešama. " -"• “remote-desktop” — ieslēdz attālinātās darbvirsmas atbalstu. Lai " -"atbalstītu attālināto darbvirsmu ar ekrāna koplietošanu, jābūt arī ieslēgtam " -"“screen-cast”. • “screen-cast” — ieslēdz ekrānraides atbalstu." +"manage HiDPI monitors. Does not require a restart." +msgstr "" +"Lai ieslēgtu eksperimentālās iespējas, pievienojiet iespējas atslēgvārdu" +" sarakstam. Vai iespējai būs nepieciešama kompozitora pārstartēšana, būs" +" atkarīga no dotās iespējas. Jebkura eksperimentāla iespēja var būt" +" nepieejama vai nekonfigurējama. Negaidiet, ka jebkura no šīm iespējām" +" nākotnē strādās. Pašlaik pieejamie atslēgvārdi: •" +" “scale-monitor-framebuffer” — liek mutter pēc noklusējuma izkārtot loģiskos" +" monitorus loģisko pikseļu koordināšu telpā, kamēr mērogo monitora kadru" +" buferus, nevis loga saturu, lai pārvaldītu HiDPI monitorus. Pārstartēšana" +" nav nepieciešama." -#: data/org.gnome.mutter.gschema.xml.in:145 +#: data/org.gnome.mutter.gschema.xml.in:141 msgid "Select window from tab popup" msgstr "Izvēlēties logu no tabulatora izvēlnes" -#: data/org.gnome.mutter.gschema.xml.in:150 +#: data/org.gnome.mutter.gschema.xml.in:146 msgid "Cancel tab popup" msgstr "Atcelt logu rādīšanu" -#: data/org.gnome.mutter.gschema.xml.in:155 +#: data/org.gnome.mutter.gschema.xml.in:151 msgid "Switch monitor configurations" msgstr "Pārslēgt monitoru konfigurācijas" -#: data/org.gnome.mutter.gschema.xml.in:160 +#: data/org.gnome.mutter.gschema.xml.in:156 msgid "Rotates the built-in monitor configuration" msgstr "Pagriež iebūvētā monitora konfigurāciju" @@ -493,10 +500,10 @@ "window or be among the applications white-listed in key “xwayland-grab-" "access-rules”." msgstr "" -"Atļaut ņemt vērā tastatūras satveršanu, ko pieprasa X11 lietotnes, kas" -" darbojas Xwayland vidē. Lai ņemtu vērā X11 tvērienus Wayland vidē, klientam" -" arī jāsūta specifisks X11 ClientMessage uz root (saknes) logu, vai arī jābūt" -" lietotņu baltajā sarakstā atslēgā “xwayland-grab-access-rules”." +"Atļaut ņemt vērā tastatūras satveršanu, ko pieprasa X11 lietotnes, kas " +"darbojas Xwayland vidē. Lai ņemtu vērā X11 tvērienus Wayland vidē, klientam " +"arī jāsūta specifisks X11 ClientMessage uz root (saknes) logu, vai arī jābūt " +"lietotņu baltajā sarakstā atslēgā “xwayland-grab-access-rules”." #: data/org.gnome.mutter.wayland.gschema.xml.in:77 msgid "Xwayland applications allowed to issue keyboard grabs" @@ -515,21 +522,21 @@ "using the specific keyboard shortcut defined by the keybinding key “restore-" "shortcuts”." msgstr "" -"Saraksts ar resursu nosaukumiem vai resursu klasi X11 logiem, kuri vai nu" -" drīkst, vai nedrīkst pieprasīt X11 tastatūras satveršanu zem Xwayland." -" Resursa nosaukumu vai resursa klasi dotajam X11 logam var iegūt, izmantojot" -" komandu “xprop WM_CLASS”. Vērtībās ir atbalstītas aizstājējzīmes “*” un “?”." -" Vērtības, ka sākas ar “!”, ir melnajā sarakstā, kam ir prioritāte pār balto" -" sarakstu, kad atsauc lietotnes no noklusējuma sistēmas saraksta. Noklusējuma" -" sistēmas sarakstā iekļauj sekojošās lietotnes: " -"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Lietotāji var pārtraukt esošo" -" tvērienu, izmantojot noteiktus tastatūras īsinājumtaustiņus, kas ir noteikti" -" “restore-shortcuts” atslēgā." +"Saraksts ar resursu nosaukumiem vai resursu klasi X11 logiem, kuri vai nu " +"drīkst, vai nedrīkst pieprasīt X11 tastatūras satveršanu zem Xwayland. " +"Resursa nosaukumu vai resursa klasi dotajam X11 logam var iegūt, izmantojot " +"komandu “xprop WM_CLASS”. Vērtībās ir atbalstītas aizstājējzīmes “*” un “?”. " +"Vērtības, ka sākas ar “!”, ir melnajā sarakstā, kam ir prioritāte pār balto " +"sarakstu, kad atsauc lietotnes no noklusējuma sistēmas saraksta. Noklusējuma " +"sistēmas sarakstā iekļauj sekojošās lietotnes: " +"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Lietotāji var pārtraukt esošo " +"tvērienu, izmantojot noteiktus tastatūras īsinājumtaustiņus, kas ir noteikti " +"“restore-shortcuts” atslēgā." #. TRANSLATORS: This string refers to a button that switches between #. * different modes. #. -#: src/backends/meta-input-settings.c:2260 +#: src/backends/meta-input-settings.c:2325 #, c-format msgid "Mode Switch (Group %d)" msgstr "Režīma slēdzis (grupa %d)" @@ -537,30 +544,30 @@ #. TRANSLATORS: This string refers to an action, cycles drawing tablets' #. * mapping through the available outputs. #. -#: src/backends/meta-input-settings.c:2283 +#: src/backends/meta-input-settings.c:2348 msgid "Switch monitor" msgstr "Pārslēgt monitoru" -#: src/backends/meta-input-settings.c:2285 +#: src/backends/meta-input-settings.c:2350 msgid "Show on-screen help" msgstr "Rādīt palīdzību uz ekrāna" -#: src/backends/meta-monitor-manager.c:900 +#: src/backends/meta-monitor-manager.c:907 msgid "Built-in display" msgstr "Iebūvēts displejs" -#: src/backends/meta-monitor-manager.c:923 +#: src/backends/meta-monitor-manager.c:930 msgid "Unknown" msgstr "Nezināms" -#: src/backends/meta-monitor-manager.c:925 +#: src/backends/meta-monitor-manager.c:932 msgid "Unknown Display" msgstr "Nezināms displejs" #. TRANSLATORS: this is a monitor vendor name, followed by a #. * size in inches, like 'Dell 15"' #. -#: src/backends/meta-monitor-manager.c:933 +#: src/backends/meta-monitor-manager.c:940 #, c-format msgid "%s %s" msgstr "%s %s" @@ -573,66 +580,65 @@ "Another compositing manager is already running on screen %i on display “%s”." msgstr "Cits kompozīcijas pārvaldnieks jau darbojas ekrānā %d displejā “%s”." -#: src/core/bell.c:194 +#: src/core/bell.c:254 msgid "Bell event" msgstr "Zvana notikums" -#: src/core/display.c:608 -#, c-format -msgid "Failed to open X Window System display “%s”\n" -msgstr "Neizdevās atvērt X logu sistēmas displeju “%s”\n" - -#: src/core/main.c:190 +#: src/core/main.c:191 msgid "Disable connection to session manager" msgstr "Deaktivēt savienojumu ar sesiju pārvaldnieku" -#: src/core/main.c:196 +#: src/core/main.c:197 msgid "Replace the running window manager" msgstr "Aizvietot darbojošos logu pārvaldnieku" -#: src/core/main.c:202 +#: src/core/main.c:203 msgid "Specify session management ID" msgstr "Norādiet sesiju pārvaldības ID" -#: src/core/main.c:207 +#: src/core/main.c:208 msgid "X Display to use" msgstr "Lietojamais X displejs" -#: src/core/main.c:213 +#: src/core/main.c:214 msgid "Initialize session from savefile" msgstr "Inicializēt sesiju no saglabātās datnes" -#: src/core/main.c:219 +#: src/core/main.c:220 msgid "Make X calls synchronous" msgstr "Padarīt X izsaukumus sinhronus" -#: src/core/main.c:226 +#: src/core/main.c:227 msgid "Run as a wayland compositor" msgstr "Palaist kā wayland kompozitoru" -#: src/core/main.c:232 +#: src/core/main.c:233 msgid "Run as a nested compositor" msgstr "Palaist kā ligzdotu kompozitoru" -#: src/core/main.c:240 +#: src/core/main.c:239 +msgid "Run wayland compositor without starting Xwayland" +msgstr "Palaist wayland kompozitoru nestartējot Xwayland" + +#: src/core/main.c:247 msgid "Run as a full display server, rather than nested" msgstr "Palaist kā pilnu attēlošanas serveri, nevis iegultu" -#: src/core/main.c:246 +#: src/core/main.c:253 msgid "Run with X11 backend" msgstr "Palaist ar X11 aizmuguri" #. Translators: %s is a window title -#: src/core/meta-close-dialog-default.c:147 +#: src/core/meta-close-dialog-default.c:148 #, c-format msgid "“%s” is not responding." msgstr "“%s” nereaģē." -#: src/core/meta-close-dialog-default.c:149 +#: src/core/meta-close-dialog-default.c:150 msgid "Application is not responding." msgstr "Lietotne nereaģē." -#: src/core/meta-close-dialog-default.c:154 +#: src/core/meta-close-dialog-default.c:155 msgid "" "You may choose to wait a short while for it to continue or force the " "application to quit entirely." @@ -640,11 +646,11 @@ "Var uzgaidīt neilgu brīdi, līdz tā atgūstas, vai arī aizvērt to piespiedu " "kārtā." -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Force Quit" msgstr "Aizvērt _piespiedu kārtā" -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Wait" msgstr "_Gaidīt" @@ -671,12 +677,21 @@ msgid "Mutter plugin to use" msgstr "Izmantojamais mutter spraudnis" -#: src/core/prefs.c:1997 +#: src/core/prefs.c:1915 #, c-format msgid "Workspace %d" msgstr "Darbvieta %d" -#: src/core/screen.c:583 +#: src/core/util.c:120 +msgid "Mutter was compiled without support for verbose mode\n" +msgstr "Mutter tika kompilēts bez detalizētas izvades režīma atbalsta\n" + +#: src/wayland/meta-wayland-tablet-pad.c:567 +#, c-format +msgid "Mode Switch: Mode %d" +msgstr "Režīma slēdzis: režīms %d" + +#: src/x11/meta-x11-display.c:666 #, c-format msgid "" "Display “%s” already has a window manager; try using the --replace option to " @@ -685,21 +700,21 @@ "Displejam “%s” jau ir logu pārvaldnieks; mēģiniet lietot --replace iespēju, " "lai aizvietotu pašreizējo logu pārvaldnieku." -#: src/core/screen.c:668 -#, c-format -msgid "Screen %d on display “%s” is invalid\n" -msgstr "Ekrāna %d displejs “%s“ nav derīgs\n" +#: src/x11/meta-x11-display.c:1010 +msgid "Failed to initialize GDK\n" +msgstr "Neizdevās inicializēt GDK\n" -#: src/core/util.c:120 -msgid "Mutter was compiled without support for verbose mode\n" -msgstr "Mutter tika kompilēts bez detalizētas izvades režīma atbalsta\n" +#: src/x11/meta-x11-display.c:1034 +#, c-format +msgid "Failed to open X Window System display “%s”\n" +msgstr "Neizdevās atvērt X logu sistēmas displeju “%s”\n" -#: src/wayland/meta-wayland-tablet-pad.c:563 +#: src/x11/meta-x11-display.c:1117 #, c-format -msgid "Mode Switch: Mode %d" -msgstr "Režīma slēdzis: režīms %d" +msgid "Screen %d on display “%s” is invalid\n" +msgstr "Ekrāna %d displejs “%s“ nav derīgs\n" -#: src/x11/session.c:1818 +#: src/x11/session.c:1819 msgid "" "These windows do not support “save current setup” and will have to be " "restarted manually next time you log in." @@ -707,7 +722,8 @@ "Šie logi neatbalsta “saglabāt pašreizējos iestatījumus” un būs jāpārstartē " "pašrocīgi nākamreiz, kad ierakstīsities." -#: src/x11/window-props.c:559 +#: src/x11/window-props.c:565 #, c-format msgid "%s (on %s)" msgstr "%s (uz %s)" + Binary files /tmp/tmpHdBE7h/ig91FQ4feh/mutter-3.29.92/po/vi.gmo and /tmp/tmpHdBE7h/kIMnP3Mfas/mutter-3.30.0/po/vi.gmo differ diff -Nru mutter-3.29.92/po/vi.po mutter-3.30.0/po/vi.po --- mutter-3.29.92/po/vi.po 2018-07-14 18:49:25.000000000 +0000 +++ mutter-3.30.0/po/vi.po 2018-09-03 22:05:08.000000000 +0000 @@ -3,15 +3,14 @@ # This file is distributed under the same license as the Metacity package. # Nguyễn Thái Ngọc Duy , 2002-2004, 2007, 2008, 2011-2013. # Clytie Siddall , 2005-2009. -# Trần Ngọc Quân , 2014, 2015, 2016, 2017. +# Trần Ngọc Quân , 2014, 2015, 2016, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: metacity master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -"product=mutter&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-09-07 15:44+0000\n" -"PO-Revision-Date: 2017-09-09 08:26+0700\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n" +"POT-Creation-Date: 2018-08-31 17:56+0000\n" +"PO-Revision-Date: 2018-09-01 08:26+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -46,134 +45,118 @@ msgstr "Chuyển cửa sổ sang không gian làm việc cuối" #: data/50-mutter-navigation.xml:24 -msgid "Move window one workspace to the left" -msgstr "Chuyển cửa sổ sang không gian làm việc bên trái" - -#: data/50-mutter-navigation.xml:27 -msgid "Move window one workspace to the right" -msgstr "Chuyển cửa sổ sang không gian làm việc bên phải" - -#: data/50-mutter-navigation.xml:30 msgid "Move window one workspace up" msgstr "Chuyển cửa sổ lên một không gian làm việc" -#: data/50-mutter-navigation.xml:33 +#: data/50-mutter-navigation.xml:27 msgid "Move window one workspace down" msgstr "Chuyển cửa sổ xuống một không gian làm việc" -#: data/50-mutter-navigation.xml:36 +#: data/50-mutter-navigation.xml:30 msgid "Move window one monitor to the left" msgstr "Chuyển cửa sổ sang trái một màn hình" -#: data/50-mutter-navigation.xml:39 +#: data/50-mutter-navigation.xml:33 msgid "Move window one monitor to the right" msgstr "Chuyển cửa sổ sang phải một màn hình" -#: data/50-mutter-navigation.xml:42 +#: data/50-mutter-navigation.xml:36 msgid "Move window one monitor up" msgstr "Chuyển cửa sổ lên một màn hình" -#: data/50-mutter-navigation.xml:45 +#: data/50-mutter-navigation.xml:39 msgid "Move window one monitor down" msgstr "Chuyển cửa sổ xuống một màn hình" -#: data/50-mutter-navigation.xml:49 +#: data/50-mutter-navigation.xml:43 msgid "Switch applications" msgstr "Chuyển ứng dụng" -#: data/50-mutter-navigation.xml:54 +#: data/50-mutter-navigation.xml:48 msgid "Switch to previous application" msgstr "Chuyển sang ứng dụng kế trước" -#: data/50-mutter-navigation.xml:58 +#: data/50-mutter-navigation.xml:52 msgid "Switch windows" msgstr "Chuyển cửa sổ" -#: data/50-mutter-navigation.xml:63 +#: data/50-mutter-navigation.xml:57 msgid "Switch to previous window" msgstr "Chuyển sang cửa sổ kế trước" -#: data/50-mutter-navigation.xml:67 +#: data/50-mutter-navigation.xml:61 msgid "Switch windows of an application" msgstr "Chuyển cửa sổ của một ứng dụng" -#: data/50-mutter-navigation.xml:72 +#: data/50-mutter-navigation.xml:66 msgid "Switch to previous window of an application" msgstr "Chuyển sang cửa sổ kế trước của một ứng dụng" -#: data/50-mutter-navigation.xml:76 +#: data/50-mutter-navigation.xml:70 msgid "Switch system controls" msgstr "Chuyển điều khiển hệ thống" -#: data/50-mutter-navigation.xml:81 +#: data/50-mutter-navigation.xml:75 msgid "Switch to previous system control" msgstr "Chuyển đến điều khiển hệ thống kế trước" -#: data/50-mutter-navigation.xml:85 +#: data/50-mutter-navigation.xml:79 msgid "Switch windows directly" msgstr "Chuyển cửa sổ trực tiếp" -#: data/50-mutter-navigation.xml:90 +#: data/50-mutter-navigation.xml:84 msgid "Switch directly to previous window" msgstr "Chuyển trực tiếp đến cửa sổ kế trước" -#: data/50-mutter-navigation.xml:94 +#: data/50-mutter-navigation.xml:88 msgid "Switch windows of an app directly" msgstr "Chuyển trực tiếp cửa sổ của một ứng dụng" -#: data/50-mutter-navigation.xml:99 +#: data/50-mutter-navigation.xml:93 msgid "Switch directly to previous window of an app" msgstr "Chuyển trực tiếp đến cửa sổ kế trước của một ứng dụng" -#: data/50-mutter-navigation.xml:103 +#: data/50-mutter-navigation.xml:97 msgid "Switch system controls directly" msgstr "Chuyển điều khiển hệ thống trực tiếp" -#: data/50-mutter-navigation.xml:108 +#: data/50-mutter-navigation.xml:102 msgid "Switch directly to previous system control" msgstr "Chuyển trực tiếp đến điều khiển hệ thống kế trước" -#: data/50-mutter-navigation.xml:111 +#: data/50-mutter-navigation.xml:105 msgid "Hide all normal windows" msgstr "Ẩn mọi cửa sổ thường" -#: data/50-mutter-navigation.xml:114 +#: data/50-mutter-navigation.xml:108 msgid "Switch to workspace 1" msgstr "Chuyển sang không gian làm việc 1" -#: data/50-mutter-navigation.xml:117 +#: data/50-mutter-navigation.xml:111 msgid "Switch to workspace 2" msgstr "Chuyển sang không gian làm việc 2" -#: data/50-mutter-navigation.xml:120 +#: data/50-mutter-navigation.xml:114 msgid "Switch to workspace 3" msgstr "Chuyển sang không gian làm việc 3" -#: data/50-mutter-navigation.xml:123 +#: data/50-mutter-navigation.xml:117 msgid "Switch to workspace 4" msgstr "Chuyển sang không gian làm việc 4" -#: data/50-mutter-navigation.xml:126 +#: data/50-mutter-navigation.xml:120 msgid "Switch to last workspace" msgstr "Chuyển sang không gian làm việc cuối" -#: data/50-mutter-navigation.xml:129 -msgid "Move to workspace left" -msgstr "Chuyển sang không gian làm việc trái" - -#: data/50-mutter-navigation.xml:132 -msgid "Move to workspace right" -msgstr "Chuyển sang không gian làm việc phải" - -#: data/50-mutter-navigation.xml:135 +#: data/50-mutter-navigation.xml:123 msgid "Move to workspace above" msgstr "Chuyển sang không gian làm việc trên" -#: data/50-mutter-navigation.xml:138 +#: data/50-mutter-navigation.xml:126 msgid "Move to workspace below" msgstr "Chuyển sang không gian làm việc dưới" -#: data/50-mutter-system.xml:6 +#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6 msgid "System" msgstr "Hệ thống" @@ -185,6 +168,10 @@ msgid "Show the activities overview" msgstr "Hiện tổng quan hoạt động" +#: data/50-mutter-wayland.xml:8 +msgid "Restore the keyboard shortcuts" +msgstr "Hoàn nguyên lại các phím tắt" + #: data/50-mutter-windows.xml:6 msgid "Windows" msgstr "Cửa sổ" @@ -210,54 +197,50 @@ msgstr "Phục hồi cửa sổ" #: data/50-mutter-windows.xml:18 -msgid "Toggle shaded state" -msgstr "Bật tắt trạng thái đánh bóng" - -#: data/50-mutter-windows.xml:20 msgid "Close window" msgstr "Đóng cửa sổ" -#: data/50-mutter-windows.xml:22 +#: data/50-mutter-windows.xml:20 msgid "Hide window" msgstr "Ẩn cửa sổ" -#: data/50-mutter-windows.xml:24 +#: data/50-mutter-windows.xml:22 msgid "Move window" msgstr "Di chuyển cửa sổ" -#: data/50-mutter-windows.xml:26 +#: data/50-mutter-windows.xml:24 msgid "Resize window" msgstr "Co giãn cửa sổ" -#: data/50-mutter-windows.xml:29 +#: data/50-mutter-windows.xml:27 msgid "Toggle window on all workspaces or one" msgstr "Dùng cửa sổ trên một/mọi không gian làm việc" -#: data/50-mutter-windows.xml:31 +#: data/50-mutter-windows.xml:29 msgid "Raise window if covered, otherwise lower it" msgstr "Nâng cửa sổ nếu bị che, không thì hạ xuống" -#: data/50-mutter-windows.xml:33 +#: data/50-mutter-windows.xml:31 msgid "Raise window above other windows" msgstr "Nâng cửa sổ trên các cửa sổ khác" -#: data/50-mutter-windows.xml:35 +#: data/50-mutter-windows.xml:33 msgid "Lower window below other windows" msgstr "Hạ cửa sổ dưới các cửa sổ khác" -#: data/50-mutter-windows.xml:37 +#: data/50-mutter-windows.xml:35 msgid "Maximize window vertically" msgstr "Phóng to cửa sổ theo chiều dọc" -#: data/50-mutter-windows.xml:39 +#: data/50-mutter-windows.xml:37 msgid "Maximize window horizontally" msgstr "Phóng to cửa sổ theo chiều ngang" -#: data/50-mutter-windows.xml:43 +#: data/50-mutter-windows.xml:41 msgid "View split on left" msgstr "Phân đôi bên trái" -#: data/50-mutter-windows.xml:47 +#: data/50-mutter-windows.xml:45 msgid "View split on right" msgstr "Phân đôi bên phải" @@ -276,9 +259,9 @@ "key” on PC hardware. It’s expected that this binding either the default or " "set to the empty string." msgstr "" -"Phím này khởi tạo “overlay”, nơi mà tổ hợp tổng quát cửa sổ và hệ thống chạy " -"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Nó được kỳ vọng " -"rằng tổ hợp hoặc là mặc định, hoặc chuỗi rỗng." +"Phím này khởi tạo “overlay”, cái mà phối hợp tổng quan cửa sổ và hệ thống " +"chạy ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Nó được kỳ " +"vọng rằng tổ hợp hoặc là mặc định, hoặc chuỗi rỗng." #: data/org.gnome.mutter.gschema.xml.in:20 msgid "Attach modal dialogs" @@ -405,36 +388,31 @@ "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes " "mutter default to layout logical monitors in a logical pixel coordinate " "space, while scaling monitor framebuffers instead of window content, to " -"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — " -"enables remote desktop support. To support remote desktop with screen " -"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables " -"screen cast support." +"manage HiDPI monitors. Does not require a restart." msgstr "" "Để bật các tính năng thử nghiệm, thêm các từ khóa tính năng vào danh sách. " "Việc tính năng mới có yêu cầu khởi động lại hay không là phụ thuộc vào tính " -"năng đã cho. Bất kỳ tính năng thử nghiệp nào không được yêu cầu vẫn sẵn " -"sàng, hoặc cấu hình được. Đừng cho rằng thêm bất kỳ thứ gì trong cài đặt này " -"thử nghiệm trong tương lai. Các từ khóa hiện có thể là: • “scale-monitor-" -"framebuffer” — làm cho mutter default to layout logical monitors trong một " -"không gian tọa độ điểm ảnh lôgíc, trong khi while scaling monitor " -"framebuffers instead of window content, để quản lý các màn hình HiDPI. Không " -"yêu cầu khởi động lại. • “remote-desktop” — cho phép điều khiển màn hình từ " -"xa. Để hỗ trợ điều khiển màn hình từ xa bằng cách chia sẻ màn hình, “screen-" -"cast” cũng phải được bật. • “screen-cast” — bật hỗ trợ chia sẻ màn hình." +"năng đã cho. Bất kỳ tính năng thử nghiệp nào sẽ không được yêu cầu cho đến " +"khi nó sẵn có, hoặc cấu hình được. Đừng cho rằng thêm bất kỳ thứ gì trong " +"cài đặt này thử nghiệm trong tương lai. Các từ khóa hiện có thể là: * “scale-" +"monitor-framebuffer” — làm cho mutter mặc định bố trí các màn hình lôgíc " +"trong một không gian tọa độ điểm ảnh lôgíc, trong khi co giãn các bộ đệm " +"khung màn hình thay vì nội dụng của cửa sổ, để quản lý các màn hình HiDPI. " +"Không yêu cầu khởi động lại." -#: data/org.gnome.mutter.gschema.xml.in:145 +#: data/org.gnome.mutter.gschema.xml.in:141 msgid "Select window from tab popup" msgstr "Chọn cửa sổ từ thanh nổi lên" -#: data/org.gnome.mutter.gschema.xml.in:150 +#: data/org.gnome.mutter.gschema.xml.in:146 msgid "Cancel tab popup" msgstr "Hủy thanh nổi lên" -#: data/org.gnome.mutter.gschema.xml.in:155 +#: data/org.gnome.mutter.gschema.xml.in:151 msgid "Switch monitor configurations" msgstr "Chuyển các cấu hình màn hình" -#: data/org.gnome.mutter.gschema.xml.in:160 +#: data/org.gnome.mutter.gschema.xml.in:156 msgid "Rotates the built-in monitor configuration" msgstr "Quay cấu hình màn hình tích hợp" @@ -490,122 +468,171 @@ msgid "Re-enable shortcuts" msgstr "Bật-lại phím tắt" +#: data/org.gnome.mutter.wayland.gschema.xml.in:64 +msgid "Allow grabs with Xwayland" +msgstr "Cho phép bắt dính với Xwayland" + +#: data/org.gnome.mutter.wayland.gschema.xml.in:65 +msgid "" +"Allow keyboard grabs issued by X11 applications running in Xwayland to be " +"taken into account. For a X11 grab to be taken into account under Wayland, " +"the client must also either send a specific X11 ClientMessage to the root " +"window or be among the applications white-listed in key “xwayland-grab-" +"access-rules”." +msgstr "" +"Cho phép khi bắt dính bàn phím xuất bởi các ứng dụng X11 chạy trong Xwayland " +"được bắt giữ vào tài khoản. Với một bắt X11 được lấy vào tài khoản dưới " +"Wayland, máy khách cũng đồng thời phải gửi một X11 ClientMessage đặc biệt " +"đến cửa sổ gốc hoặc trong số các ứng dụng danh-sách-trắng trong khóa " +"“xwayland-grab-access-rules”." + +#: data/org.gnome.mutter.wayland.gschema.xml.in:77 +msgid "Xwayland applications allowed to issue keyboard grabs" +msgstr "Các ứng dụng Xwayland cho phép phát ra các bắt dính bàn phím" + +#: data/org.gnome.mutter.wayland.gschema.xml.in:78 +msgid "" +"List the resource names or resource class of X11 windows either allowed or " +"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or " +"resource class of a given X11 window can be obtained using the command " +"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. " +"Values starting with “!” are blacklisted, which has precedence over the " +"whitelist, to revoke applications from the default system list. The default " +"system list includes the following applications: " +"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by " +"using the specific keyboard shortcut defined by the keybinding key “restore-" +"shortcuts”." +msgstr "" +"Liệt kê các tên tài nguyên hoặc lớp tài nguyên của các cửa sổ X11 hoặc là " +"cho phép hoặc là không có phép phát bắt bàn phím dưới Xwayland. Tên tài " +"nguyên hoặc lớp tài nguyên của cửa số X11 đã cho có thể kiếm được bằng cách " +"chạy lệnh “xprop WM_CLASS”. Các ký tự địa diện “*” và jokers “?” trong giá " +"trị được hỗ trợ. Giá trị bắt đầu bằng “!” là danh sách bị cấm, những thứ có " +"quyền ưu tiên cao hơn danh sách trắng, để thu hồi ứng dụng từ danh sách hệ " +"thống mặc định. Danh sách hệ thống mặc định bao gồm các ứng dụng sau đây: " +"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Người dùng có thể ngắt một bắt sẵn có " +"bằng cách sử dụng phím tắt đặc biệt được định nghĩa bằng cách ràng buộc phím " +"“restore-shortcuts”." + #. TRANSLATORS: This string refers to a button that switches between #. * different modes. #. -#: src/backends/meta-input-settings.c:2151 +#: src/backends/meta-input-settings.c:2325 #, c-format msgid "Mode Switch (Group %d)" -msgstr "Chuyển chế độ(Nhóm %d)" +msgstr "Chuyển chế độ (Nhóm %d)" #. TRANSLATORS: This string refers to an action, cycles drawing tablets' #. * mapping through the available outputs. #. -#: src/backends/meta-input-settings.c:2174 +#: src/backends/meta-input-settings.c:2348 msgid "Switch monitor" msgstr "Chuyển màn hình" -#: src/backends/meta-input-settings.c:2176 +#: src/backends/meta-input-settings.c:2350 msgid "Show on-screen help" msgstr "Hiển thị trợ giúp trên-màn-hình" -#: src/backends/meta-monitor-manager.c:903 +#: src/backends/meta-monitor-manager.c:886 msgid "Built-in display" msgstr "Màn hình tích hợp" -#: src/backends/meta-monitor-manager.c:926 +#: src/backends/meta-monitor-manager.c:909 msgid "Unknown" msgstr "Không rõ" -#: src/backends/meta-monitor-manager.c:928 +#: src/backends/meta-monitor-manager.c:911 msgid "Unknown Display" msgstr "Không hiểu màn hình" #. TRANSLATORS: this is a monitor vendor name, followed by a #. * size in inches, like 'Dell 15"' #. -#: src/backends/meta-monitor-manager.c:936 +#: src/backends/meta-monitor-manager.c:919 #, c-format msgid "%s %s" msgstr "%s %s" #. This probably means that a non-WM compositor like xcompmgr is running; #. * we have no way to get it to exit -#: src/compositor/compositor.c:476 +#: src/compositor/compositor.c:481 #, c-format msgid "" "Another compositing manager is already running on screen %i on display “%s”." msgstr "" -"Bộ quản lý cửa sổ đã đang chạy trên Màn hình %i trên bộ trình bày “%s”." +"Bộ quản lý cửa sổ đã đang chạy trên màn hình %i trên bộ trình bày “%s”." -#: src/core/bell.c:194 +#: src/core/bell.c:254 msgid "Bell event" msgstr "Sự kiện chuông" -#: src/core/display.c:608 -#, c-format -msgid "Failed to open X Window System display “%s”\n" -msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X “%s”\n" - -#: src/core/main.c:189 +#: src/core/main.c:191 msgid "Disable connection to session manager" msgstr "Vô hiệu hóa kết nối với bộ quản lý phiên làm việc" -#: src/core/main.c:195 +#: src/core/main.c:197 msgid "Replace the running window manager" msgstr "Thay thế bộ quản lý cửa sổ đang chạy" -#: src/core/main.c:201 +#: src/core/main.c:203 msgid "Specify session management ID" msgstr "Ghi rõ mã số quản lý phiên làm việc" -#: src/core/main.c:206 +#: src/core/main.c:208 msgid "X Display to use" msgstr "Bộ trình bày X cần dùng" -#: src/core/main.c:212 +#: src/core/main.c:214 msgid "Initialize session from savefile" msgstr "Khởi động phiên làm việc từ tập tin lưu" -#: src/core/main.c:218 +#: src/core/main.c:220 msgid "Make X calls synchronous" msgstr "Khiến các cú gọi X đồng bộ với nhau" -#: src/core/main.c:225 +#: src/core/main.c:227 msgid "Run as a wayland compositor" msgstr "Chạy như là một “wayland compositor”" -#: src/core/main.c:231 +#: src/core/main.c:233 msgid "Run as a nested compositor" msgstr "Chạy như là một “nested compositor”" #: src/core/main.c:239 +msgid "Run wayland compositor without starting Xwayland" +msgstr "Chạy bộ sắp xếp wayland mà không khởi chạy Xwayland" + +#: src/core/main.c:247 msgid "Run as a full display server, rather than nested" msgstr "Chạy như là một dịch vụ hiển thị đầy đủ, thay cho lồng nhau" +#: src/core/main.c:253 +msgid "Run with X11 backend" +msgstr "Chạy với ứng dụng chạy phía sau X11" + #. Translators: %s is a window title -#: src/core/meta-close-dialog-default.c:147 +#: src/core/meta-close-dialog-default.c:148 #, c-format msgid "“%s” is not responding." msgstr "“%s” không trả lời." -#: src/core/meta-close-dialog-default.c:149 +#: src/core/meta-close-dialog-default.c:150 msgid "Application is not responding." msgstr "Ứng dụng không trả lời." -#: src/core/meta-close-dialog-default.c:154 +#: src/core/meta-close-dialog-default.c:155 msgid "" "You may choose to wait a short while for it to continue or force the " "application to quit entirely." msgstr "" -"Bạn có thể chọn chờ một lúc cho nó tiếp tục hoặc buộc chấm dứt hoàn toàn ứng " -"dụng." +"Bạn có thể chọn chờ một lúc để nó có thể tiếp tục chạy hoặc buộc chấm dứt " +"hoàn toàn ứng dụng." -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Force Quit" msgstr "_Buộc thoát" -#: src/core/meta-close-dialog-default.c:161 +#: src/core/meta-close-dialog-default.c:162 msgid "_Wait" msgstr "_Chờ" @@ -633,12 +660,21 @@ msgid "Mutter plugin to use" msgstr "Phần bổ sung Mutter cần dùng" -#: src/core/prefs.c:1997 +#: src/core/prefs.c:1787 #, c-format msgid "Workspace %d" msgstr "Không gian làm việc %d" -#: src/core/screen.c:580 +#: src/core/util.c:120 +msgid "Mutter was compiled without support for verbose mode\n" +msgstr "Mutter đã được biên dịch không hỗ trợ chế độ chi tiết\n" + +#: src/wayland/meta-wayland-tablet-pad.c:567 +#, c-format +msgid "Mode Switch: Mode %d" +msgstr "Chuyển chế độ: Chế độ %d" + +#: src/x11/meta-x11-display.c:666 #, c-format msgid "" "Display “%s” already has a window manager; try using the --replace option to " @@ -647,21 +683,21 @@ "Màn hình “%s” đã có bộ quản lý cửa sổ rồi; hãy thử dùng tùy chọn --replace " "để thay thế bộ quản lý cửa sổ đang dùng." -#: src/core/screen.c:665 -#, c-format -msgid "Screen %d on display “%s” is invalid\n" -msgstr "Màn hình %d trên bộ trình bày “%s” không hợp lệ.\n" +#: src/x11/meta-x11-display.c:1010 +msgid "Failed to initialize GDK\n" +msgstr "Gặp lỗi khi khởi tạo GDK\n" -#: src/core/util.c:120 -msgid "Mutter was compiled without support for verbose mode\n" -msgstr "Mutter đã được biên dịch không hỗ trợ chế độ chi tiết\n" +#: src/x11/meta-x11-display.c:1034 +#, c-format +msgid "Failed to open X Window System display “%s”\n" +msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X “%s”\n" -#: src/wayland/meta-wayland-tablet-pad.c:563 +#: src/x11/meta-x11-display.c:1117 #, c-format -msgid "Mode Switch: Mode %d" -msgstr "Chuyển chế độ: Chế độ %d" +msgid "Screen %d on display “%s” is invalid\n" +msgstr "Màn hình %d trên bộ trình bày “%s” không hợp lệ.\n" -#: src/x11/session.c:1815 +#: src/x11/session.c:1819 msgid "" "These windows do not support “save current setup” and will have to be " "restarted manually next time you log in." @@ -669,11 +705,26 @@ "Những cửa sổ này không hỗ trợ “lưu cài đặt hiện tại” và sẽ phải khởi động " "lại bằng tay lần kế bạn đăng nhập." -#: src/x11/window-props.c:559 +#: src/x11/window-props.c:565 #, c-format msgid "%s (on %s)" msgstr "%s (trên %s)" +#~ msgid "Move window one workspace to the left" +#~ msgstr "Chuyển cửa sổ sang không gian làm việc bên trái" + +#~ msgid "Move window one workspace to the right" +#~ msgstr "Chuyển cửa sổ sang không gian làm việc bên phải" + +#~ msgid "Move to workspace left" +#~ msgstr "Chuyển sang không gian làm việc trái" + +#~ msgid "Move to workspace right" +#~ msgstr "Chuyển sang không gian làm việc phải" + +#~ msgid "Toggle shaded state" +#~ msgstr "Bật tắt trạng thái đánh bóng" + #~ msgid "Failed to scan themes directory: %s\n" #~ msgstr "Gặp lỗi khi quét thư mục lưu chủ đề: %s\n" diff -Nru mutter-3.29.92/src/compositor/plugins/Makefile.in mutter-3.30.0/src/compositor/plugins/Makefile.in --- mutter-3.29.92/src/compositor/plugins/Makefile.in 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/src/compositor/plugins/Makefile.in 2018-09-03 22:06:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -159,7 +159,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/default_la-default.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -443,8 +444,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -500,7 +501,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default_la-default.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default_la-default.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -591,7 +598,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -664,7 +674,7 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/default_la-default.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -711,7 +721,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/default_la-default.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -732,20 +742,21 @@ .MAKE: install-am install-exec-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-hook install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-local uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkglibLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-local \ + uninstall-pkglibLTLIBRARIES .PRECIOUS: Makefile diff -Nru mutter-3.29.92/src/Makefile.in mutter-3.30.0/src/Makefile.in --- mutter-3.29.92/src/Makefile.in 2018-08-29 16:42:58.000000000 +0000 +++ mutter-3.30.0/src/Makefile.in 2018-09-03 22:06:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -321,6 +321,22 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(stackingdir)" \ + "$(DESTDIR)$(girdir)" "$(DESTDIR)$(installedtestsdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" \ + "$(DESTDIR)$(libmutterincludedir)" \ + "$(DESTDIR)$(libmutterincludedir)" +am__EXEEXT_1 = +@HAVE_WAYLAND_TRUE@am__EXEEXT_2 = mutter-test-client$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ mutter-test-runner$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ mutter-test-unit-tests$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ mutter-test-headless-start-test$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ $(am__EXEEXT_1) +@BUILDOPT_INSTALL_TESTS_FALSE@@HAVE_WAYLAND_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2) +PROGRAMS = $(bin_PROGRAMS) $(installedtestsbin_PROGRAMS) \ + $(libexec_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -348,12 +364,6 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" \ - "$(DESTDIR)$(stackingdir)" "$(DESTDIR)$(girdir)" \ - "$(DESTDIR)$(installedtestsdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libmutterincludedir)" \ - "$(DESTDIR)$(libmutterincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libmutter_@LIBMUTTER_API_VERSION@_la_DEPENDENCIES = \ @@ -841,15 +851,6 @@ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libmutter_@LIBMUTTER_API_VERSION@_la_LDFLAGS) $(LDFLAGS) -o \ $@ -am__EXEEXT_1 = -@HAVE_WAYLAND_TRUE@am__EXEEXT_2 = mutter-test-client$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ mutter-test-runner$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ mutter-test-unit-tests$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ mutter-test-headless-start-test$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ $(am__EXEEXT_1) -@BUILDOPT_INSTALL_TESTS_FALSE@@HAVE_WAYLAND_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2) -PROGRAMS = $(bin_PROGRAMS) $(installedtestsbin_PROGRAMS) \ - $(libexec_PROGRAMS) $(noinst_PROGRAMS) am_mutter_OBJECTS = core/mutter.$(OBJEXT) mutter_OBJECTS = $(am_mutter_OBJECTS) mutter_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -930,7 +931,208 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/gtk-primary-selection-protocol.Plo \ + ./$(DEPDIR)/gtk-shell-protocol.Plo \ + ./$(DEPDIR)/gtk-text-input-protocol.Plo \ + ./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo \ + ./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo \ + ./$(DEPDIR)/meta-dbus-display-config.Plo \ + ./$(DEPDIR)/meta-dbus-idle-monitor.Plo \ + ./$(DEPDIR)/meta-dbus-login1.Plo \ + ./$(DEPDIR)/meta-dbus-remote-desktop.Plo \ + ./$(DEPDIR)/meta-dbus-screen-cast.Plo \ + ./$(DEPDIR)/meta-enum-types.Plo \ + ./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo \ + ./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo \ + ./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo \ + ./$(DEPDIR)/tablet-unstable-v2-protocol.Plo \ + ./$(DEPDIR)/text-input-unstable-v3-protocol.Plo \ + ./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo \ + ./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo \ + ./$(DEPDIR)/xdg-shell-protocol.Plo \ + ./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo \ + ./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo \ + backends/$(DEPDIR)/edid-parse.Plo \ + backends/$(DEPDIR)/meta-backend.Plo \ + backends/$(DEPDIR)/meta-barrier.Plo \ + backends/$(DEPDIR)/meta-crtc.Plo \ + backends/$(DEPDIR)/meta-cursor-renderer.Plo \ + backends/$(DEPDIR)/meta-cursor-sprite-xcursor.Plo \ + backends/$(DEPDIR)/meta-cursor-tracker.Plo \ + backends/$(DEPDIR)/meta-cursor.Plo \ + backends/$(DEPDIR)/meta-dbus-session-watcher.Plo \ + backends/$(DEPDIR)/meta-egl.Plo \ + backends/$(DEPDIR)/meta-gles3.Plo \ + backends/$(DEPDIR)/meta-gpu.Plo \ + backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo \ + backends/$(DEPDIR)/meta-idle-monitor.Plo \ + backends/$(DEPDIR)/meta-input-settings.Plo \ + backends/$(DEPDIR)/meta-logical-monitor.Plo \ + backends/$(DEPDIR)/meta-monitor-config-manager.Plo \ + backends/$(DEPDIR)/meta-monitor-config-migration.Plo \ + backends/$(DEPDIR)/meta-monitor-config-store.Plo \ + backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo \ + backends/$(DEPDIR)/meta-monitor-manager.Plo \ + backends/$(DEPDIR)/meta-monitor.Plo \ + backends/$(DEPDIR)/meta-orientation-manager.Plo \ + backends/$(DEPDIR)/meta-output.Plo \ + backends/$(DEPDIR)/meta-pointer-constraint.Plo \ + backends/$(DEPDIR)/meta-remote-access-controller.Plo \ + backends/$(DEPDIR)/meta-remote-desktop-session.Plo \ + backends/$(DEPDIR)/meta-remote-desktop.Plo \ + backends/$(DEPDIR)/meta-renderer-view.Plo \ + backends/$(DEPDIR)/meta-renderer.Plo \ + backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo \ + backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo \ + backends/$(DEPDIR)/meta-screen-cast-session.Plo \ + backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo \ + backends/$(DEPDIR)/meta-screen-cast-stream.Plo \ + backends/$(DEPDIR)/meta-screen-cast.Plo \ + backends/$(DEPDIR)/meta-settings.Plo \ + backends/$(DEPDIR)/meta-stage.Plo \ + backends/native/$(DEPDIR)/dbus-utils.Plo \ + backends/native/$(DEPDIR)/meta-backend-native.Plo \ + backends/native/$(DEPDIR)/meta-barrier-native.Plo \ + backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo \ + backends/native/$(DEPDIR)/meta-crtc-kms.Plo \ + backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo \ + backends/native/$(DEPDIR)/meta-gpu-kms.Plo \ + backends/native/$(DEPDIR)/meta-input-settings-native.Plo \ + backends/native/$(DEPDIR)/meta-launcher.Plo \ + backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo \ + backends/native/$(DEPDIR)/meta-output-kms.Plo \ + backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo \ + backends/native/$(DEPDIR)/meta-renderer-native.Plo \ + backends/native/$(DEPDIR)/meta-stage-native.Plo \ + backends/x11/$(DEPDIR)/meta-backend-x11.Plo \ + backends/x11/$(DEPDIR)/meta-barrier-x11.Plo \ + backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo \ + backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo \ + backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo \ + backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo \ + backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo \ + backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo \ + backends/x11/$(DEPDIR)/meta-output-xrandr.Plo \ + backends/x11/$(DEPDIR)/meta-renderer-x11.Plo \ + backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo \ + backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo \ + backends/x11/cm/$(DEPDIR)/meta-cursor-sprite-xfixes.Plo \ + backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo \ + backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo \ + backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo \ + backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo \ + compositor/$(DEPDIR)/clutter-utils.Plo \ + compositor/$(DEPDIR)/cogl-utils.Plo \ + compositor/$(DEPDIR)/compositor.Plo \ + compositor/$(DEPDIR)/meta-background-actor.Plo \ + compositor/$(DEPDIR)/meta-background-group.Plo \ + compositor/$(DEPDIR)/meta-background-image.Plo \ + compositor/$(DEPDIR)/meta-background.Plo \ + compositor/$(DEPDIR)/meta-cullable.Plo \ + compositor/$(DEPDIR)/meta-dnd-actor.Plo \ + compositor/$(DEPDIR)/meta-dnd.Plo \ + compositor/$(DEPDIR)/meta-feedback-actor.Plo \ + compositor/$(DEPDIR)/meta-module.Plo \ + compositor/$(DEPDIR)/meta-plugin-manager.Plo \ + compositor/$(DEPDIR)/meta-plugin.Plo \ + compositor/$(DEPDIR)/meta-shadow-factory.Plo \ + compositor/$(DEPDIR)/meta-shaped-texture.Plo \ + compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo \ + compositor/$(DEPDIR)/meta-surface-actor-x11.Plo \ + compositor/$(DEPDIR)/meta-surface-actor.Plo \ + compositor/$(DEPDIR)/meta-sync-ring.Plo \ + compositor/$(DEPDIR)/meta-texture-rectangle.Plo \ + compositor/$(DEPDIR)/meta-texture-tower.Plo \ + compositor/$(DEPDIR)/meta-window-actor.Plo \ + compositor/$(DEPDIR)/meta-window-group.Plo \ + compositor/$(DEPDIR)/meta-window-shape.Plo \ + compositor/$(DEPDIR)/region-utils.Plo core/$(DEPDIR)/bell.Plo \ + core/$(DEPDIR)/boxes.Plo core/$(DEPDIR)/constraints.Plo \ + core/$(DEPDIR)/core.Plo core/$(DEPDIR)/delete.Plo \ + core/$(DEPDIR)/display.Plo core/$(DEPDIR)/edge-resistance.Plo \ + core/$(DEPDIR)/events.Plo core/$(DEPDIR)/frame.Plo \ + core/$(DEPDIR)/keybindings.Plo core/$(DEPDIR)/main.Plo \ + core/$(DEPDIR)/meta-accel-parse.Plo \ + core/$(DEPDIR)/meta-border.Plo \ + core/$(DEPDIR)/meta-close-dialog-default.Plo \ + core/$(DEPDIR)/meta-close-dialog.Plo \ + core/$(DEPDIR)/meta-fraction.Plo \ + core/$(DEPDIR)/meta-gesture-tracker.Plo \ + core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo \ + core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo \ + core/$(DEPDIR)/meta-workspace-manager.Plo \ + core/$(DEPDIR)/mutter.Po core/$(DEPDIR)/place.Plo \ + core/$(DEPDIR)/prefs.Plo core/$(DEPDIR)/restart-helper.Po \ + core/$(DEPDIR)/restart.Plo core/$(DEPDIR)/stack-tracker.Plo \ + core/$(DEPDIR)/stack.Plo \ + core/$(DEPDIR)/startup-notification.Plo \ + core/$(DEPDIR)/testboxes.Po core/$(DEPDIR)/util.Plo \ + core/$(DEPDIR)/window.Plo core/$(DEPDIR)/workspace.Plo \ + tests/$(DEPDIR)/headless-start-test.Po \ + tests/$(DEPDIR)/meta-backend-test.Po \ + tests/$(DEPDIR)/meta-monitor-manager-test.Po \ + tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po \ + tests/$(DEPDIR)/monitor-store-unit-tests.Po \ + tests/$(DEPDIR)/monitor-test-utils.Po \ + tests/$(DEPDIR)/monitor-unit-tests.Po \ + tests/$(DEPDIR)/test-client.Po tests/$(DEPDIR)/test-runner.Po \ + tests/$(DEPDIR)/test-utils.Po tests/$(DEPDIR)/unit-tests.Po \ + ui/$(DEPDIR)/frames.Plo ui/$(DEPDIR)/theme.Plo \ + ui/$(DEPDIR)/ui.Plo \ + wayland/$(DEPDIR)/meta-cursor-sprite-wayland.Plo \ + wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo \ + wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo \ + wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo \ + wayland/$(DEPDIR)/meta-wayland-buffer.Plo \ + wayland/$(DEPDIR)/meta-wayland-cursor-surface.Plo \ + wayland/$(DEPDIR)/meta-wayland-data-device.Plo \ + wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo \ + wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo \ + wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo \ + wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo \ + wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo \ + wayland/$(DEPDIR)/meta-wayland-input-device.Plo \ + wayland/$(DEPDIR)/meta-wayland-keyboard.Plo \ + wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo \ + wayland/$(DEPDIR)/meta-wayland-outputs.Plo \ + wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo \ + wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo \ + wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo \ + wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo \ + wayland/$(DEPDIR)/meta-wayland-pointer.Plo \ + wayland/$(DEPDIR)/meta-wayland-popup.Plo \ + wayland/$(DEPDIR)/meta-wayland-region.Plo \ + wayland/$(DEPDIR)/meta-wayland-seat.Plo \ + wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo \ + wayland/$(DEPDIR)/meta-wayland-subsurface.Plo \ + wayland/$(DEPDIR)/meta-wayland-surface.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-cursor-surface.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo \ + wayland/$(DEPDIR)/meta-wayland-tablet.Plo \ + wayland/$(DEPDIR)/meta-wayland-text-input-legacy.Plo \ + wayland/$(DEPDIR)/meta-wayland-text-input.Plo \ + wayland/$(DEPDIR)/meta-wayland-touch.Plo \ + wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo \ + wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo \ + wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo \ + wayland/$(DEPDIR)/meta-wayland.Plo \ + wayland/$(DEPDIR)/meta-window-wayland.Plo \ + wayland/$(DEPDIR)/meta-window-xwayland.Plo \ + wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo \ + wayland/$(DEPDIR)/meta-xwayland-selection.Plo \ + wayland/$(DEPDIR)/meta-xwayland.Plo x11/$(DEPDIR)/events.Plo \ + x11/$(DEPDIR)/group-props.Plo x11/$(DEPDIR)/group.Plo \ + x11/$(DEPDIR)/iconcache.Plo x11/$(DEPDIR)/meta-x11-display.Plo \ + x11/$(DEPDIR)/meta-x11-errors.Plo x11/$(DEPDIR)/session.Plo \ + x11/$(DEPDIR)/window-props.Plo x11/$(DEPDIR)/window-x11.Plo \ + x11/$(DEPDIR)/xprops.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -998,7 +1200,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -1672,8 +1874,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(srcdir)/Makefile-tests.am $(am__empty): @@ -1685,6 +1887,162 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +install-installedtestsbinPROGRAMS: $(installedtestsbin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installedtestsbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installedtestsbindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(installedtestsbindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(installedtestsbindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-installedtestsbinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(installedtestsbindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(installedtestsbindir)" && rm -f $$files + +clean-installedtestsbinPROGRAMS: + @list='$(installedtestsbin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + +clean-libexecPROGRAMS: + @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -2144,162 +2502,6 @@ libmutter-@LIBMUTTER_API_VERSION@.la: $(libmutter_@LIBMUTTER_API_VERSION@_la_OBJECTS) $(libmutter_@LIBMUTTER_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libmutter_@LIBMUTTER_API_VERSION@_la_DEPENDENCIES) $(AM_V_CCLD)$(libmutter_@LIBMUTTER_API_VERSION@_la_LINK) -rpath $(libdir) $(libmutter_@LIBMUTTER_API_VERSION@_la_OBJECTS) $(libmutter_@LIBMUTTER_API_VERSION@_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -install-installedtestsbinPROGRAMS: $(installedtestsbin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(installedtestsbindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(installedtestsbindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(installedtestsbindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(installedtestsbindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-installedtestsbinPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(installedtestsbindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(installedtestsbindir)" && rm -f $$files - -clean-installedtestsbinPROGRAMS: - @list='$(installedtestsbin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -install-libexecPROGRAMS: $(libexec_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-libexecPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files - -clean-libexecPROGRAMS: - @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list core/mutter.$(OBJEXT): core/$(am__dirstamp) \ core/$(DEPDIR)/$(am__dirstamp) @@ -2390,226 +2592,232 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-primary-selection-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-shell-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-text-input-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-display-config.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-idle-monitor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-login1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-remote-desktop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-screen-cast.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-enum-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tablet-unstable-v2-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-input-unstable-v3-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/edid-parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-backend.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-barrier.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-crtc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-renderer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-sprite-xcursor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-tracker.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-dbus-session-watcher.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-egl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gles3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gpu.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-input-settings.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-logical-monitor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-migration.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-store.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-orientation-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-output.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-pointer-constraint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-access-controller.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop-session.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer-view.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-session.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-settings.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-stage.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/dbus-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-backend-native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-barrier-native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-crtc-kms.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-gpu-kms.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-input-settings-native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-launcher.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-output-kms.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-stage-native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-backend-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-barrier-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-output-xrandr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-renderer-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-cursor-sprite-xfixes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/clutter-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/cogl-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/compositor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-image.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-cullable.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-feedback-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-module.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shadow-factory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shaped-texture.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-sync-ring.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-rectangle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-tower.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-shape.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/region-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/bell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/boxes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/constraints.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/core.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/delete.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/display.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/edge-resistance.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/events.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/frame.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/keybindings.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/main.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-accel-parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-border.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog-default.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-fraction.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-gesture-tracker.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-workspace-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/mutter.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/place.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/prefs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart-helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack-tracker.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/startup-notification.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/testboxes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/window.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/workspace.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/headless-start-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-backend-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-monitor-manager-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-store-unit-tests.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-test-utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-unit-tests.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-client.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-runner.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/unit-tests.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/frames.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/theme.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/ui.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-cursor-sprite-wayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-cursor-surface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-data-device.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-input-device.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-keyboard.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-outputs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-popup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-region.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-seat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-subsurface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-cursor-surface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-text-input-legacy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-text-input.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-touch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-wayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-xwayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-selection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/events.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group-props.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/iconcache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/meta-x11-display.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/meta-x11-errors.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/session.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-props.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-x11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/xprops.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-primary-selection-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-shell-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-text-input-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-display-config.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-idle-monitor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-login1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-remote-desktop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-screen-cast.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-enum-types.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tablet-unstable-v2-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-input-unstable-v3-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/edid-parse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-backend.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-barrier.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-crtc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-renderer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-sprite-xcursor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-tracker.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-dbus-session-watcher.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-egl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gles3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gpu.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-input-settings.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-logical-monitor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-migration.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-store.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-orientation-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-output.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-pointer-constraint.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-access-controller.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop-session.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer-view.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-session.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-settings.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-stage.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/dbus-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-backend-native.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-barrier-native.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-crtc-kms.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-gpu-kms.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-input-settings-native.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-launcher.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-output-kms.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-stage-native.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-backend-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-barrier-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-output-xrandr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-renderer-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-cursor-sprite-xfixes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/clutter-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/cogl-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/compositor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-group.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-image.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-cullable.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-feedback-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-module.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shadow-factory.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shaped-texture.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-sync-ring.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-rectangle.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-tower.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-actor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-group.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-shape.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/region-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/bell.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/boxes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/constraints.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/core.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/delete.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/display.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/edge-resistance.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/events.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/frame.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/keybindings.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/main.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-accel-parse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-border.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog-default.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-fraction.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-gesture-tracker.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-workspace-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/mutter.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/place.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/prefs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart-helper.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack-tracker.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/startup-notification.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/testboxes.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/window.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/workspace.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/headless-start-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-backend-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-monitor-manager-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-store-unit-tests.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-test-utils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-unit-tests.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-client.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-runner.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-utils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/unit-tests.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/frames.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/theme.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/ui.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-cursor-sprite-wayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-cursor-surface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-data-device.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-input-device.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-keyboard.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-outputs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-popup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-region.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-seat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-subsurface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-cursor-surface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-text-input-legacy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-text-input.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-touch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-wayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-xwayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-selection.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/events.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group-props.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/iconcache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/meta-x11-display.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/meta-x11-errors.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/session.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-props.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-x11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/xprops.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -2897,7 +3105,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2955,12 +3166,12 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(stackingdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(installedtestsdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libmutterincludedir)" "$(DESTDIR)$(libmutterincludedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(stackingdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(installedtestsdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libmutterincludedir)" "$(DESTDIR)$(libmutterincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -3027,7 +3238,226 @@ mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) backends/$(DEPDIR) backends/native/$(DEPDIR) backends/x11/$(DEPDIR) backends/x11/cm/$(DEPDIR) backends/x11/nested/$(DEPDIR) compositor/$(DEPDIR) core/$(DEPDIR) tests/$(DEPDIR) ui/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) + -rm -f ./$(DEPDIR)/gtk-primary-selection-protocol.Plo + -rm -f ./$(DEPDIR)/gtk-shell-protocol.Plo + -rm -f ./$(DEPDIR)/gtk-text-input-protocol.Plo + -rm -f ./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/meta-dbus-display-config.Plo + -rm -f ./$(DEPDIR)/meta-dbus-idle-monitor.Plo + -rm -f ./$(DEPDIR)/meta-dbus-login1.Plo + -rm -f ./$(DEPDIR)/meta-dbus-remote-desktop.Plo + -rm -f ./$(DEPDIR)/meta-dbus-screen-cast.Plo + -rm -f ./$(DEPDIR)/meta-enum-types.Plo + -rm -f ./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/tablet-unstable-v2-protocol.Plo + -rm -f ./$(DEPDIR)/text-input-unstable-v3-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-shell-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo + -rm -f ./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo + -rm -f backends/$(DEPDIR)/edid-parse.Plo + -rm -f backends/$(DEPDIR)/meta-backend.Plo + -rm -f backends/$(DEPDIR)/meta-barrier.Plo + -rm -f backends/$(DEPDIR)/meta-crtc.Plo + -rm -f backends/$(DEPDIR)/meta-cursor-renderer.Plo + -rm -f backends/$(DEPDIR)/meta-cursor-sprite-xcursor.Plo + -rm -f backends/$(DEPDIR)/meta-cursor-tracker.Plo + -rm -f backends/$(DEPDIR)/meta-cursor.Plo + -rm -f backends/$(DEPDIR)/meta-dbus-session-watcher.Plo + -rm -f backends/$(DEPDIR)/meta-egl.Plo + -rm -f backends/$(DEPDIR)/meta-gles3.Plo + -rm -f backends/$(DEPDIR)/meta-gpu.Plo + -rm -f backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo + -rm -f backends/$(DEPDIR)/meta-idle-monitor.Plo + -rm -f backends/$(DEPDIR)/meta-input-settings.Plo + -rm -f backends/$(DEPDIR)/meta-logical-monitor.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-config-manager.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-config-migration.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-config-store.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-manager.Plo + -rm -f backends/$(DEPDIR)/meta-monitor.Plo + -rm -f backends/$(DEPDIR)/meta-orientation-manager.Plo + -rm -f backends/$(DEPDIR)/meta-output.Plo + -rm -f backends/$(DEPDIR)/meta-pointer-constraint.Plo + -rm -f backends/$(DEPDIR)/meta-remote-access-controller.Plo + -rm -f backends/$(DEPDIR)/meta-remote-desktop-session.Plo + -rm -f backends/$(DEPDIR)/meta-remote-desktop.Plo + -rm -f backends/$(DEPDIR)/meta-renderer-view.Plo + -rm -f backends/$(DEPDIR)/meta-renderer.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-session.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-stream.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast.Plo + -rm -f backends/$(DEPDIR)/meta-settings.Plo + -rm -f backends/$(DEPDIR)/meta-stage.Plo + -rm -f backends/native/$(DEPDIR)/dbus-utils.Plo + -rm -f backends/native/$(DEPDIR)/meta-backend-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-barrier-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-crtc-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-gpu-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-input-settings-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-launcher.Plo + -rm -f backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-output-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo + -rm -f backends/native/$(DEPDIR)/meta-renderer-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-stage-native.Plo + -rm -f backends/x11/$(DEPDIR)/meta-backend-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-barrier-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-output-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-renderer-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo + -rm -f backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo + -rm -f backends/x11/cm/$(DEPDIR)/meta-cursor-sprite-xfixes.Plo + -rm -f backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo + -rm -f backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo + -rm -f backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo + -rm -f backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo + -rm -f compositor/$(DEPDIR)/clutter-utils.Plo + -rm -f compositor/$(DEPDIR)/cogl-utils.Plo + -rm -f compositor/$(DEPDIR)/compositor.Plo + -rm -f compositor/$(DEPDIR)/meta-background-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-background-group.Plo + -rm -f compositor/$(DEPDIR)/meta-background-image.Plo + -rm -f compositor/$(DEPDIR)/meta-background.Plo + -rm -f compositor/$(DEPDIR)/meta-cullable.Plo + -rm -f compositor/$(DEPDIR)/meta-dnd-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-dnd.Plo + -rm -f compositor/$(DEPDIR)/meta-feedback-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-module.Plo + -rm -f compositor/$(DEPDIR)/meta-plugin-manager.Plo + -rm -f compositor/$(DEPDIR)/meta-plugin.Plo + -rm -f compositor/$(DEPDIR)/meta-shadow-factory.Plo + -rm -f compositor/$(DEPDIR)/meta-shaped-texture.Plo + -rm -f compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo + -rm -f compositor/$(DEPDIR)/meta-surface-actor-x11.Plo + -rm -f compositor/$(DEPDIR)/meta-surface-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-sync-ring.Plo + -rm -f compositor/$(DEPDIR)/meta-texture-rectangle.Plo + -rm -f compositor/$(DEPDIR)/meta-texture-tower.Plo + -rm -f compositor/$(DEPDIR)/meta-window-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-window-group.Plo + -rm -f compositor/$(DEPDIR)/meta-window-shape.Plo + -rm -f compositor/$(DEPDIR)/region-utils.Plo + -rm -f core/$(DEPDIR)/bell.Plo + -rm -f core/$(DEPDIR)/boxes.Plo + -rm -f core/$(DEPDIR)/constraints.Plo + -rm -f core/$(DEPDIR)/core.Plo + -rm -f core/$(DEPDIR)/delete.Plo + -rm -f core/$(DEPDIR)/display.Plo + -rm -f core/$(DEPDIR)/edge-resistance.Plo + -rm -f core/$(DEPDIR)/events.Plo + -rm -f core/$(DEPDIR)/frame.Plo + -rm -f core/$(DEPDIR)/keybindings.Plo + -rm -f core/$(DEPDIR)/main.Plo + -rm -f core/$(DEPDIR)/meta-accel-parse.Plo + -rm -f core/$(DEPDIR)/meta-border.Plo + -rm -f core/$(DEPDIR)/meta-close-dialog-default.Plo + -rm -f core/$(DEPDIR)/meta-close-dialog.Plo + -rm -f core/$(DEPDIR)/meta-fraction.Plo + -rm -f core/$(DEPDIR)/meta-gesture-tracker.Plo + -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo + -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo + -rm -f core/$(DEPDIR)/meta-workspace-manager.Plo + -rm -f core/$(DEPDIR)/mutter.Po + -rm -f core/$(DEPDIR)/place.Plo + -rm -f core/$(DEPDIR)/prefs.Plo + -rm -f core/$(DEPDIR)/restart-helper.Po + -rm -f core/$(DEPDIR)/restart.Plo + -rm -f core/$(DEPDIR)/stack-tracker.Plo + -rm -f core/$(DEPDIR)/stack.Plo + -rm -f core/$(DEPDIR)/startup-notification.Plo + -rm -f core/$(DEPDIR)/testboxes.Po + -rm -f core/$(DEPDIR)/util.Plo + -rm -f core/$(DEPDIR)/window.Plo + -rm -f core/$(DEPDIR)/workspace.Plo + -rm -f tests/$(DEPDIR)/headless-start-test.Po + -rm -f tests/$(DEPDIR)/meta-backend-test.Po + -rm -f tests/$(DEPDIR)/meta-monitor-manager-test.Po + -rm -f tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po + -rm -f tests/$(DEPDIR)/monitor-store-unit-tests.Po + -rm -f tests/$(DEPDIR)/monitor-test-utils.Po + -rm -f tests/$(DEPDIR)/monitor-unit-tests.Po + -rm -f tests/$(DEPDIR)/test-client.Po + -rm -f tests/$(DEPDIR)/test-runner.Po + -rm -f tests/$(DEPDIR)/test-utils.Po + -rm -f tests/$(DEPDIR)/unit-tests.Po + -rm -f ui/$(DEPDIR)/frames.Plo + -rm -f ui/$(DEPDIR)/theme.Plo + -rm -f ui/$(DEPDIR)/ui.Plo + -rm -f wayland/$(DEPDIR)/meta-cursor-sprite-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-buffer.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-cursor-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-data-device.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-input-device.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-keyboard.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-outputs.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-popup.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-region.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-seat.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-subsurface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-cursor-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-text-input-legacy.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-text-input.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-touch.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-window-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-window-xwayland.Plo + -rm -f wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo + -rm -f wayland/$(DEPDIR)/meta-xwayland-selection.Plo + -rm -f wayland/$(DEPDIR)/meta-xwayland.Plo + -rm -f x11/$(DEPDIR)/events.Plo + -rm -f x11/$(DEPDIR)/group-props.Plo + -rm -f x11/$(DEPDIR)/group.Plo + -rm -f x11/$(DEPDIR)/iconcache.Plo + -rm -f x11/$(DEPDIR)/meta-x11-display.Plo + -rm -f x11/$(DEPDIR)/meta-x11-errors.Plo + -rm -f x11/$(DEPDIR)/session.Plo + -rm -f x11/$(DEPDIR)/window-props.Plo + -rm -f x11/$(DEPDIR)/window-x11.Plo + -rm -f x11/$(DEPDIR)/xprops.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -3078,7 +3508,226 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) backends/$(DEPDIR) backends/native/$(DEPDIR) backends/x11/$(DEPDIR) backends/x11/cm/$(DEPDIR) backends/x11/nested/$(DEPDIR) compositor/$(DEPDIR) core/$(DEPDIR) tests/$(DEPDIR) ui/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) + -rm -f ./$(DEPDIR)/gtk-primary-selection-protocol.Plo + -rm -f ./$(DEPDIR)/gtk-shell-protocol.Plo + -rm -f ./$(DEPDIR)/gtk-text-input-protocol.Plo + -rm -f ./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/meta-dbus-display-config.Plo + -rm -f ./$(DEPDIR)/meta-dbus-idle-monitor.Plo + -rm -f ./$(DEPDIR)/meta-dbus-login1.Plo + -rm -f ./$(DEPDIR)/meta-dbus-remote-desktop.Plo + -rm -f ./$(DEPDIR)/meta-dbus-screen-cast.Plo + -rm -f ./$(DEPDIR)/meta-enum-types.Plo + -rm -f ./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/tablet-unstable-v2-protocol.Plo + -rm -f ./$(DEPDIR)/text-input-unstable-v3-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-shell-protocol.Plo + -rm -f ./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo + -rm -f ./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo + -rm -f backends/$(DEPDIR)/edid-parse.Plo + -rm -f backends/$(DEPDIR)/meta-backend.Plo + -rm -f backends/$(DEPDIR)/meta-barrier.Plo + -rm -f backends/$(DEPDIR)/meta-crtc.Plo + -rm -f backends/$(DEPDIR)/meta-cursor-renderer.Plo + -rm -f backends/$(DEPDIR)/meta-cursor-sprite-xcursor.Plo + -rm -f backends/$(DEPDIR)/meta-cursor-tracker.Plo + -rm -f backends/$(DEPDIR)/meta-cursor.Plo + -rm -f backends/$(DEPDIR)/meta-dbus-session-watcher.Plo + -rm -f backends/$(DEPDIR)/meta-egl.Plo + -rm -f backends/$(DEPDIR)/meta-gles3.Plo + -rm -f backends/$(DEPDIR)/meta-gpu.Plo + -rm -f backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo + -rm -f backends/$(DEPDIR)/meta-idle-monitor.Plo + -rm -f backends/$(DEPDIR)/meta-input-settings.Plo + -rm -f backends/$(DEPDIR)/meta-logical-monitor.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-config-manager.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-config-migration.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-config-store.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo + -rm -f backends/$(DEPDIR)/meta-monitor-manager.Plo + -rm -f backends/$(DEPDIR)/meta-monitor.Plo + -rm -f backends/$(DEPDIR)/meta-orientation-manager.Plo + -rm -f backends/$(DEPDIR)/meta-output.Plo + -rm -f backends/$(DEPDIR)/meta-pointer-constraint.Plo + -rm -f backends/$(DEPDIR)/meta-remote-access-controller.Plo + -rm -f backends/$(DEPDIR)/meta-remote-desktop-session.Plo + -rm -f backends/$(DEPDIR)/meta-remote-desktop.Plo + -rm -f backends/$(DEPDIR)/meta-renderer-view.Plo + -rm -f backends/$(DEPDIR)/meta-renderer.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-session.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast-stream.Plo + -rm -f backends/$(DEPDIR)/meta-screen-cast.Plo + -rm -f backends/$(DEPDIR)/meta-settings.Plo + -rm -f backends/$(DEPDIR)/meta-stage.Plo + -rm -f backends/native/$(DEPDIR)/dbus-utils.Plo + -rm -f backends/native/$(DEPDIR)/meta-backend-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-barrier-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-crtc-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-gpu-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-input-settings-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-launcher.Plo + -rm -f backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-output-kms.Plo + -rm -f backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo + -rm -f backends/native/$(DEPDIR)/meta-renderer-native.Plo + -rm -f backends/native/$(DEPDIR)/meta-stage-native.Plo + -rm -f backends/x11/$(DEPDIR)/meta-backend-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-barrier-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-output-xrandr.Plo + -rm -f backends/x11/$(DEPDIR)/meta-renderer-x11.Plo + -rm -f backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo + -rm -f backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo + -rm -f backends/x11/cm/$(DEPDIR)/meta-cursor-sprite-xfixes.Plo + -rm -f backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo + -rm -f backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo + -rm -f backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo + -rm -f backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo + -rm -f compositor/$(DEPDIR)/clutter-utils.Plo + -rm -f compositor/$(DEPDIR)/cogl-utils.Plo + -rm -f compositor/$(DEPDIR)/compositor.Plo + -rm -f compositor/$(DEPDIR)/meta-background-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-background-group.Plo + -rm -f compositor/$(DEPDIR)/meta-background-image.Plo + -rm -f compositor/$(DEPDIR)/meta-background.Plo + -rm -f compositor/$(DEPDIR)/meta-cullable.Plo + -rm -f compositor/$(DEPDIR)/meta-dnd-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-dnd.Plo + -rm -f compositor/$(DEPDIR)/meta-feedback-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-module.Plo + -rm -f compositor/$(DEPDIR)/meta-plugin-manager.Plo + -rm -f compositor/$(DEPDIR)/meta-plugin.Plo + -rm -f compositor/$(DEPDIR)/meta-shadow-factory.Plo + -rm -f compositor/$(DEPDIR)/meta-shaped-texture.Plo + -rm -f compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo + -rm -f compositor/$(DEPDIR)/meta-surface-actor-x11.Plo + -rm -f compositor/$(DEPDIR)/meta-surface-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-sync-ring.Plo + -rm -f compositor/$(DEPDIR)/meta-texture-rectangle.Plo + -rm -f compositor/$(DEPDIR)/meta-texture-tower.Plo + -rm -f compositor/$(DEPDIR)/meta-window-actor.Plo + -rm -f compositor/$(DEPDIR)/meta-window-group.Plo + -rm -f compositor/$(DEPDIR)/meta-window-shape.Plo + -rm -f compositor/$(DEPDIR)/region-utils.Plo + -rm -f core/$(DEPDIR)/bell.Plo + -rm -f core/$(DEPDIR)/boxes.Plo + -rm -f core/$(DEPDIR)/constraints.Plo + -rm -f core/$(DEPDIR)/core.Plo + -rm -f core/$(DEPDIR)/delete.Plo + -rm -f core/$(DEPDIR)/display.Plo + -rm -f core/$(DEPDIR)/edge-resistance.Plo + -rm -f core/$(DEPDIR)/events.Plo + -rm -f core/$(DEPDIR)/frame.Plo + -rm -f core/$(DEPDIR)/keybindings.Plo + -rm -f core/$(DEPDIR)/main.Plo + -rm -f core/$(DEPDIR)/meta-accel-parse.Plo + -rm -f core/$(DEPDIR)/meta-border.Plo + -rm -f core/$(DEPDIR)/meta-close-dialog-default.Plo + -rm -f core/$(DEPDIR)/meta-close-dialog.Plo + -rm -f core/$(DEPDIR)/meta-fraction.Plo + -rm -f core/$(DEPDIR)/meta-gesture-tracker.Plo + -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo + -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo + -rm -f core/$(DEPDIR)/meta-workspace-manager.Plo + -rm -f core/$(DEPDIR)/mutter.Po + -rm -f core/$(DEPDIR)/place.Plo + -rm -f core/$(DEPDIR)/prefs.Plo + -rm -f core/$(DEPDIR)/restart-helper.Po + -rm -f core/$(DEPDIR)/restart.Plo + -rm -f core/$(DEPDIR)/stack-tracker.Plo + -rm -f core/$(DEPDIR)/stack.Plo + -rm -f core/$(DEPDIR)/startup-notification.Plo + -rm -f core/$(DEPDIR)/testboxes.Po + -rm -f core/$(DEPDIR)/util.Plo + -rm -f core/$(DEPDIR)/window.Plo + -rm -f core/$(DEPDIR)/workspace.Plo + -rm -f tests/$(DEPDIR)/headless-start-test.Po + -rm -f tests/$(DEPDIR)/meta-backend-test.Po + -rm -f tests/$(DEPDIR)/meta-monitor-manager-test.Po + -rm -f tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po + -rm -f tests/$(DEPDIR)/monitor-store-unit-tests.Po + -rm -f tests/$(DEPDIR)/monitor-test-utils.Po + -rm -f tests/$(DEPDIR)/monitor-unit-tests.Po + -rm -f tests/$(DEPDIR)/test-client.Po + -rm -f tests/$(DEPDIR)/test-runner.Po + -rm -f tests/$(DEPDIR)/test-utils.Po + -rm -f tests/$(DEPDIR)/unit-tests.Po + -rm -f ui/$(DEPDIR)/frames.Plo + -rm -f ui/$(DEPDIR)/theme.Plo + -rm -f ui/$(DEPDIR)/ui.Plo + -rm -f wayland/$(DEPDIR)/meta-cursor-sprite-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-buffer.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-cursor-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-data-device.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-input-device.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-keyboard.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-outputs.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-pointer.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-popup.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-region.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-seat.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-subsurface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-cursor-surface.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-tablet.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-text-input-legacy.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-text-input.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-touch.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo + -rm -f wayland/$(DEPDIR)/meta-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-window-wayland.Plo + -rm -f wayland/$(DEPDIR)/meta-window-xwayland.Plo + -rm -f wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo + -rm -f wayland/$(DEPDIR)/meta-xwayland-selection.Plo + -rm -f wayland/$(DEPDIR)/meta-xwayland.Plo + -rm -f x11/$(DEPDIR)/events.Plo + -rm -f x11/$(DEPDIR)/group-props.Plo + -rm -f x11/$(DEPDIR)/group.Plo + -rm -f x11/$(DEPDIR)/iconcache.Plo + -rm -f x11/$(DEPDIR)/meta-x11-display.Plo + -rm -f x11/$(DEPDIR)/meta-x11-errors.Plo + -rm -f x11/$(DEPDIR)/session.Plo + -rm -f x11/$(DEPDIR)/window-props.Plo + -rm -f x11/$(DEPDIR)/window-x11.Plo + -rm -f x11/$(DEPDIR)/xprops.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -3105,17 +3754,17 @@ .MAKE: $(am__recursive_targets) all check install install-am \ install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-binPROGRAMS clean-generic \ - clean-installedtestsbinPROGRAMS clean-libLTLIBRARIES \ - clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_stackingDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-girDATA install-html \ - install-html-am install-info install-info-am \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles check check-am clean clean-binPROGRAMS \ + clean-generic clean-installedtestsbinPROGRAMS \ + clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_stackingDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-girDATA \ + install-html install-html-am install-info install-info-am \ install-installedtestsDATA install-installedtestsbinPROGRAMS \ install-libLTLIBRARIES install-libexecPROGRAMS \ install-libmutterincludeHEADERS install-man \