--- fvwm-2.5.27.ds.orig/Makefile.am +++ fvwm-2.5.27.ds/Makefile.am @@ -14,7 +14,6 @@ doc \ docs \ rpm \ - debian \ sample.fvwmrc \ $(POSUB) \ tests @@ -83,13 +82,13 @@ # make deb-dist cparams='--enable-gnome --quiet' mparams='CFLAGS="-O2 -g"' # make deb-inplace release=1.mg fullname=migo # works on sources directly -deb-regenerate: - (cd debian && $(MAKE) $(AM_MAKEFLAGS) Makefile control) || exit 1 +#deb-regenerate: +# (cd debian && $(MAKE) $(AM_MAKEFLAGS) Makefile control) || exit 1 -deb-dist: dist deb-this +#deb-dist: dist deb-this -deb-this: deb-regenerate - $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) this || exit 1 +#deb-this: deb-regenerate +# $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) this || exit 1 -deb-inplace: deb-regenerate - $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) inplace || exit 1 +#deb-inplace: deb-regenerate +# $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) inplace || exit 1 --- fvwm-2.5.27.ds.orig/aclocal.m4 +++ fvwm-2.5.27.ds/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 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. @@ -11,7 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +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, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,14 +29,31 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +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.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -85,14 +110,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # 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. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -101,8 +126,10 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -116,15 +143,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # 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. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -152,6 +178,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -217,6 +244,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -269,7 +297,8 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -294,8 +323,9 @@ # 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. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: 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 @@ -354,14 +384,14 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008 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. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -378,16 +408,20 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -407,6 +441,9 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -442,6 +479,10 @@ [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -455,16 +496,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -477,7 +519,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -555,14 +597,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # 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. -# serial 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -578,6 +620,7 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -588,7 +631,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -596,60 +639,23 @@ # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -761,9 +767,21 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 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_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. --- fvwm-2.5.27.ds.orig/acinclude.m4 +++ fvwm-2.5.27.ds/acinclude.m4 @@ -527,6 +527,156 @@ ]) +dnl -------------------------------------------------------------------------- +dnl contents of imlib.m4 +dnl modified by migo - write diagnostics to >&5 (i.e. config.log) not stdout + +# Configure paths for IMLIB +# Frank Belew 98-8-31 +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS +dnl +AC_DEFUN([AM_PATH_IMLIB], +[dnl +dnl Get the cflags and libraries from the imlib-config script +dnl +AC_ARG_WITH([imlib-prefix],[ --with-imlib-prefix=PFX prefix for IMLIB files (optional)], + imlib_prefix="$withval", imlib_prefix="") +AC_ARG_WITH(imlib-exec-prefix,[ --with-imlib-exec-prefix=PFX exec prefix for IMLIB files (optional)], + imlib_exec_prefix="$withval", imlib_exec_prefix="") +AC_ARG_ENABLE(imlibtest, [ --disable-imlibtest do not try to compile and run a test IMLIB program], + , enable_imlibtest=yes) + + if test x$imlib_exec_prefix != x ; then + imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix" + if test x${IMLIBCONF+set} != xset ; then + IMLIBCONF=$imlib_exec_prefix/bin/imlib-config + fi + fi + if test x$imlib_prefix != x ; then + imlib_args="$imlib_args --prefix=$imlib_prefix" + if test x${IMLIBCONF+set} != xset ; then + IMLIBCONF=$imlib_prefix/bin/imlib-config + fi + fi + + AC_PATH_PROG(IMLIBCONF, imlib-config, no) + min_imlib_version=ifelse([$1], ,1.8.1,$1) + AC_MSG_CHECKING(for IMLIB - version >= $min_imlib_version) + no_imlib="" + if test "$IMLIBCONF" = "no" ; then + no_imlib=yes + else + IMLIB_CFLAGS=`$IMLIBCONF $imlibconf_args --cflags` + IMLIB_LIBS=`$IMLIBCONF $imlibconf_args --libs` + + imlib_major_version=`$IMLIBCONF $imlib_args --version | \ + sed 's/^[[^0-9.]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\1/'` + imlib_minor_version=`$IMLIBCONF $imlib_args --version | \ + sed 's/^[[^0-9.]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\2/'` + if test "x$enable_imlibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $IMLIB_CFLAGS" + LIBS="$LIBS $IMLIB_LIBS" +dnl +dnl Now check if the installed IMLIB is sufficiently new. (Also sanity +dnl checks the results of imlib-config to some extent +dnl + rm -f conf.imlibtest + AC_TRY_RUN([ +#include +#include +#include + +ImlibImage testimage; + +int main () +{ + int major, minor; + char *tmp_version; + + system ("touch conf.imlibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = strdup("$min_imlib_version"); + if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) { + printf("%s, bad version string\n", "$min_imlib_version"); + exit(1); + } + + if (($imlib_major_version > major) || + (($imlib_major_version == major) && ($imlib_minor_version > minor))) + { + return 0; + } + else + { + printf("\n*** 'imlib-config --version' returned %d.%d, but the minimum version\n", $imlib_major_version, $imlib_minor_version); + printf("*** of IMLIB required is %d.%d. If imlib-config is correct, then it is\n", major, minor); + printf("*** best to upgrade to the required version.\n"); + printf("*** If imlib-config was wrong, set the environment variable IMLIBCONF\n"); + printf("*** to point to the correct copy of imlib-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_imlib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_imlib" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$IMLIBCONF" = "no" ; then + echo "*** The imlib-config script installed by IMLIB could not be found" + echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the IMLIBCONF environment variable to the" + echo "*** full path to imlib-config." + else + if test -f conf.imlibtest ; then + : + else + echo "*** Could not run IMLIB test program, checking why..." + CFLAGS="$CFLAGS $IMLIB_CFLAGS" + LIBS="$LIBS $IMLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding IMLIB or finding the wrong" + echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means IMLIB was incorrectly installed" + echo "*** or that you have moved IMLIB since it was installed. In the latter case, you" + echo "*** may want to edit the imlib-config script: $IMLIBCONF" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + IMLIB_CFLAGS="" + IMLIB_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(IMLIB_CFLAGS) + AC_SUBST(IMLIB_LIBS) + rm -f conf.imlibtest +]) + # Check for gdk-imlib AC_DEFUN([AM_PATH_GDK_IMLIB], [dnl --- fvwm-2.5.27.ds.orig/configure.ac +++ fvwm-2.5.27.ds/configure.ac @@ -1752,8 +1752,6 @@ perllib/FVWM/Module.pm rpm/Makefile rpm/fvwm.spec - debian/Makefile - debian/control doc/fvwm.ent doc/footer.html doc/Makefile --- fvwm-2.5.27.ds.orig/configure +++ fvwm-2.5.27.ds/configure @@ -668,6 +668,7 @@ INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA +am__isrc CYGPATH_W PACKAGE VERSION @@ -2029,7 +2030,8 @@ -am__api_version="1.9" +am__api_version='1.10' + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2212,38 +2214,53 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do @@ -2326,12 +2343,16 @@ fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -2374,7 +2395,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2478,7 +2499,7 @@ fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2780,9 +2801,7 @@ am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -2791,7 +2810,6 @@ fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3778,6 +3796,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3807,9 +3826,7 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -6161,6 +6178,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -6190,9 +6208,7 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -9606,9 +9622,7 @@ with_mandoc="yes" fi fi - - -if test x"$with_mandoc" = xyes; then + if test x"$with_mandoc" = xyes; then FVWM_BUILD_MANDOC_TRUE= FVWM_BUILD_MANDOC_FALSE='#' else @@ -9647,9 +9661,7 @@ with_htmldoc="yes" fi fi - - -if test x"$with_htmldoc" = xyes; then + if test x"$with_htmldoc" = xyes; then FVWM_BUILD_HTMLDOC_TRUE= FVWM_BUILD_HTMLDOC_FALSE='#' else @@ -21825,7 +21837,7 @@ LOCAL_BUGADDR=${FVWM_BUGADDR-${USER-${LOGNAME-`whoami`}}} -ac_config_files="$ac_config_files Makefile libs/Makefile fvwm/Makefile modules/Makefile bin/fvwm-bug.1 bin/fvwm-config.1 bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1 bin/fvwm-root.1 modules/FvwmAnimate/FvwmAnimate.1 modules/FvwmAuto/FvwmAuto.1 modules/FvwmBacker/FvwmBacker.1 modules/FvwmBanner/FvwmBanner.1 modules/FvwmButtons/FvwmButtons.1 modules/FvwmCommand/FvwmCommand.1 modules/FvwmConsole/FvwmConsole.1 modules/FvwmConsole/FvwmConsoleC.pl.1 modules/FvwmCpp/FvwmCpp.1 modules/FvwmDragWell/FvwmDragWell.1 modules/FvwmEvent/FvwmEvent.1 modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1 modules/FvwmIconBox/FvwmIconBox.1 modules/FvwmIconMan/FvwmIconMan.1 modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1 modules/FvwmPager/FvwmPager.1 modules/FvwmProxy/FvwmProxy.1 modules/FvwmRearrange/FvwmRearrange.1 modules/FvwmSave/FvwmSave.1 modules/FvwmSaveDesk/FvwmSaveDesk.1 modules/FvwmScript/FvwmScript.1 modules/FvwmScroll/FvwmScroll.1 modules/FvwmTaskBar/FvwmTaskBar.1 modules/FvwmTheme/FvwmTheme.1 modules/FvwmWharf/FvwmWharf.1 modules/FvwmWinList/FvwmWinList.1 bin/Makefile bin/fvwm-config bin/fvwm-bug bin/fvwm-perllib bin/fvwm-menu-xlock bin/fvwm-menu-directory bin/fvwm-menu-desktop bin/fvwm-menu-headlines bin/fvwm-convert-2.4 bin/fvwm-convert-2.6 utils/Makefile perllib/Makefile perllib/General/Makefile perllib/FVWM/Makefile perllib/FVWM/Module/Makefile perllib/FVWM/Tracker/Makefile perllib/FVWM/Module.pm rpm/Makefile rpm/fvwm.spec debian/Makefile debian/control doc/fvwm.ent doc/footer.html doc/Makefile doc/fvwm/Makefile doc/commands/Makefile doc/docbook-xml/Makefile doc/docbook-xml/ent/Makefile doc/docbook-xsl/Makefile doc/docbook-xsl/common/Makefile doc/docbook-xsl/manpages/Makefile doc/docbook-xsl/profiling/Makefile doc/docbook-xsl/highlighting/Makefile doc/docbook-xsl/lib/Makefile doc/docbook-xsl/html/Makefile doc/modules/Makefile doc/modules/images/Makefile doc/modules/images/FvwmTabs/Makefile doc/images/Makefile doc/images/svg_rendering/Makefile docs/fvwm.lsm docs/Makefile sample.fvwmrc/Makefile tests/Makefile tests/hints/Makefile po/Makefile modules/FvwmAnimate/Makefile modules/FvwmAuto/Makefile modules/FvwmBacker/Makefile modules/FvwmBanner/Makefile modules/FvwmButtons/Makefile modules/FvwmCommand/Makefile modules/FvwmCommand/scripts/Makefile modules/FvwmConsole/Makefile modules/FvwmConsole/FvwmConsoleC.pl modules/FvwmCpp/Makefile modules/FvwmDebug/Makefile modules/FvwmDebug/FvwmDebug modules/FvwmDebug/FvwmGtkDebug modules/FvwmDragWell/Makefile modules/FvwmEvent/Makefile modules/FvwmForm/Makefile modules/FvwmIconBox/Makefile modules/FvwmIconMan/Makefile modules/FvwmIdent/Makefile modules/FvwmM4/Makefile modules/FvwmPager/Makefile modules/FvwmPerl/Makefile modules/FvwmPerl/FvwmPerl modules/FvwmProxy/Makefile modules/FvwmRearrange/Makefile modules/FvwmSave/Makefile modules/FvwmSaveDesk/Makefile modules/FvwmScript/Makefile modules/FvwmScript/Scripts/Makefile modules/FvwmScript/Widgets/Makefile modules/FvwmScroll/Makefile modules/FvwmTabs/Makefile modules/FvwmTabs/FvwmTabs modules/FvwmTaskBar/Makefile modules/FvwmTheme/Makefile modules/FvwmWharf/Makefile modules/FvwmWinList/Makefile modules/FvwmWindowMenu/Makefile modules/FvwmWindowMenu/FvwmWindowMenu modules/FvwmGtk/Makefile" +ac_config_files="$ac_config_files Makefile libs/Makefile fvwm/Makefile modules/Makefile bin/fvwm-bug.1 bin/fvwm-config.1 bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1 bin/fvwm-root.1 modules/FvwmAnimate/FvwmAnimate.1 modules/FvwmAuto/FvwmAuto.1 modules/FvwmBacker/FvwmBacker.1 modules/FvwmBanner/FvwmBanner.1 modules/FvwmButtons/FvwmButtons.1 modules/FvwmCommand/FvwmCommand.1 modules/FvwmConsole/FvwmConsole.1 modules/FvwmConsole/FvwmConsoleC.pl.1 modules/FvwmCpp/FvwmCpp.1 modules/FvwmDragWell/FvwmDragWell.1 modules/FvwmEvent/FvwmEvent.1 modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1 modules/FvwmIconBox/FvwmIconBox.1 modules/FvwmIconMan/FvwmIconMan.1 modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1 modules/FvwmPager/FvwmPager.1 modules/FvwmProxy/FvwmProxy.1 modules/FvwmRearrange/FvwmRearrange.1 modules/FvwmSave/FvwmSave.1 modules/FvwmSaveDesk/FvwmSaveDesk.1 modules/FvwmScript/FvwmScript.1 modules/FvwmScroll/FvwmScroll.1 modules/FvwmTaskBar/FvwmTaskBar.1 modules/FvwmTheme/FvwmTheme.1 modules/FvwmWharf/FvwmWharf.1 modules/FvwmWinList/FvwmWinList.1 bin/Makefile bin/fvwm-config bin/fvwm-bug bin/fvwm-perllib bin/fvwm-menu-xlock bin/fvwm-menu-directory bin/fvwm-menu-desktop bin/fvwm-menu-headlines bin/fvwm-convert-2.4 bin/fvwm-convert-2.6 utils/Makefile perllib/Makefile perllib/General/Makefile perllib/FVWM/Makefile perllib/FVWM/Module/Makefile perllib/FVWM/Tracker/Makefile perllib/FVWM/Module.pm rpm/Makefile rpm/fvwm.spec doc/fvwm.ent doc/footer.html doc/Makefile doc/fvwm/Makefile doc/commands/Makefile doc/docbook-xml/Makefile doc/docbook-xml/ent/Makefile doc/docbook-xsl/Makefile doc/docbook-xsl/common/Makefile doc/docbook-xsl/manpages/Makefile doc/docbook-xsl/profiling/Makefile doc/docbook-xsl/highlighting/Makefile doc/docbook-xsl/lib/Makefile doc/docbook-xsl/html/Makefile doc/modules/Makefile doc/modules/images/Makefile doc/modules/images/FvwmTabs/Makefile doc/images/Makefile doc/images/svg_rendering/Makefile docs/fvwm.lsm docs/Makefile sample.fvwmrc/Makefile tests/Makefile tests/hints/Makefile po/Makefile modules/FvwmAnimate/Makefile modules/FvwmAuto/Makefile modules/FvwmBacker/Makefile modules/FvwmBanner/Makefile modules/FvwmButtons/Makefile modules/FvwmCommand/Makefile modules/FvwmCommand/scripts/Makefile modules/FvwmConsole/Makefile modules/FvwmConsole/FvwmConsoleC.pl modules/FvwmCpp/Makefile modules/FvwmDebug/Makefile modules/FvwmDebug/FvwmDebug modules/FvwmDebug/FvwmGtkDebug modules/FvwmDragWell/Makefile modules/FvwmEvent/Makefile modules/FvwmForm/Makefile modules/FvwmIconBox/Makefile modules/FvwmIconMan/Makefile modules/FvwmIdent/Makefile modules/FvwmM4/Makefile modules/FvwmPager/Makefile modules/FvwmPerl/Makefile modules/FvwmPerl/FvwmPerl modules/FvwmProxy/Makefile modules/FvwmRearrange/Makefile modules/FvwmSave/Makefile modules/FvwmSaveDesk/Makefile modules/FvwmScript/Makefile modules/FvwmScript/Scripts/Makefile modules/FvwmScript/Widgets/Makefile modules/FvwmScroll/Makefile modules/FvwmTabs/Makefile modules/FvwmTabs/FvwmTabs modules/FvwmTaskBar/Makefile modules/FvwmTheme/Makefile modules/FvwmWharf/Makefile modules/FvwmWinList/Makefile modules/FvwmWindowMenu/Makefile modules/FvwmWindowMenu/FvwmWindowMenu modules/FvwmGtk/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22322,6 +22334,7 @@ ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -22484,8 +22497,6 @@ "perllib/FVWM/Module.pm") CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Module.pm" ;; "rpm/Makefile") CONFIG_FILES="$CONFIG_FILES rpm/Makefile" ;; "rpm/fvwm.spec") CONFIG_FILES="$CONFIG_FILES rpm/fvwm.spec" ;; - "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;; - "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;; "doc/fvwm.ent") CONFIG_FILES="$CONFIG_FILES doc/fvwm.ent" ;; "doc/footer.html") CONFIG_FILES="$CONFIG_FILES doc/footer.html" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; @@ -22668,6 +22679,7 @@ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim CYGPATH_W!$CYGPATH_W$ac_delim PACKAGE!$PACKAGE$ac_delim VERSION!$VERSION$ac_delim @@ -22709,7 +22721,6 @@ AMDEP_FALSE!$AMDEP_FALSE$ac_delim AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -22751,6 +22762,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim CPP!$CPP$ac_delim X_CFLAGS!$X_CFLAGS$ac_delim @@ -22847,7 +22859,6 @@ ALLOCA!$ALLOCA$ac_delim LIBOBJS!$LIBOBJS$ac_delim GTK_CONFIG!$GTK_CONFIG$ac_delim -FVWMGTK!$FVWMGTK$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -22889,6 +22900,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +FVWMGTK!$FVWMGTK$ac_delim MANFVWMGTK!$MANFVWMGTK$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim GTK_LIBS!$GTK_LIBS$ac_delim @@ -22924,7 +22936,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -23151,6 +23163,11 @@ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -23204,6 +23221,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out @@ -23319,21 +23337,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23368,8 +23387,9 @@ # 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. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: 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\(//\)[^/]' \| \ --- fvwm-2.5.27.ds.orig/Makefile.in +++ fvwm-2.5.27.ds/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,18 +31,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ config.guess config.sub depcomp install-sh missing -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -54,10 +50,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -76,8 +75,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -129,10 +126,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -156,6 +149,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -172,6 +166,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -219,9 +214,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -233,6 +230,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -272,10 +270,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -309,7 +310,6 @@ doc \ docs \ rpm \ - debian \ sample.fvwmrc \ $(POSUB) \ tests @@ -371,7 +371,7 @@ config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -384,7 +384,6 @@ distclean-hdr: -rm -f config.h stamp-h1 -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -417,8 +416,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -462,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -488,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -499,13 +497,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -520,24 +517,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/bin $(distdir)/debian $(distdir)/doc $(distdir)/docs $(distdir)/modules/FvwmAnimate $(distdir)/modules/FvwmAuto $(distdir)/modules/FvwmBacker $(distdir)/modules/FvwmBanner $(distdir)/modules/FvwmButtons $(distdir)/modules/FvwmCommand $(distdir)/modules/FvwmConsole $(distdir)/modules/FvwmCpp $(distdir)/modules/FvwmDebug $(distdir)/modules/FvwmDragWell $(distdir)/modules/FvwmEvent $(distdir)/modules/FvwmForm $(distdir)/modules/FvwmGtk $(distdir)/modules/FvwmIconBox $(distdir)/modules/FvwmIconMan $(distdir)/modules/FvwmIdent $(distdir)/modules/FvwmM4 $(distdir)/modules/FvwmPager $(distdir)/modules/FvwmPerl $(distdir)/modules/FvwmProxy $(distdir)/modules/FvwmRearrange $(distdir)/modules/FvwmSave $(distdir)/modules/FvwmSaveDesk $(distdir)/modules/FvwmScript $(distdir)/modules/FvwmScroll $(distdir)/modules/FvwmTabs $(distdir)/modules/FvwmTaskBar $(distdir)/modules/FvwmTheme $(distdir)/modules/FvwmWharf $(distdir)/modules/FvwmWinList $(distdir)/modules/FvwmWindowMenu $(distdir)/perllib/FVWM $(distdir)/rpm $(distdir)/vms - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -551,7 +546,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -559,6 +554,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -566,7 +563,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -576,6 +573,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -602,6 +603,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -641,7 +644,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -710,12 +713,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -736,24 +747,25 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-recursive distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am dist2: dist @@ -795,16 +807,16 @@ # make deb-dist cparams='--enable-gnome --quiet' mparams='CFLAGS="-O2 -g"' # make deb-inplace release=1.mg fullname=migo # works on sources directly -deb-regenerate: - (cd debian && $(MAKE) $(AM_MAKEFLAGS) Makefile control) || exit 1 +#deb-regenerate: +# (cd debian && $(MAKE) $(AM_MAKEFLAGS) Makefile control) || exit 1 -deb-dist: dist deb-this +#deb-dist: dist deb-this -deb-this: deb-regenerate - $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) this || exit 1 +#deb-this: deb-regenerate +# $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) this || exit 1 -deb-inplace: deb-regenerate - $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) inplace || exit 1 +#deb-inplace: deb-regenerate +# $(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) inplace || exit 1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- fvwm-2.5.27.ds.orig/docs/Makefile.in +++ fvwm-2.5.27.ds/docs/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -106,10 +100,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -133,6 +123,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -149,6 +140,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -196,9 +188,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -210,6 +204,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -249,10 +244,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -313,7 +311,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh fvwm.lsm: $(top_builddir)/config.status $(srcdir)/fvwm.lsm.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -uninstall-info-am: tags: TAGS TAGS: @@ -322,22 +319,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -396,12 +392,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -420,16 +424,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/po/Makefile.in +++ fvwm-2.5.27.ds/po/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -106,10 +100,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -133,6 +123,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -149,6 +140,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -196,9 +188,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -210,6 +204,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -249,10 +244,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -344,7 +342,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -353,22 +350,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -427,12 +423,20 @@ install-data-am: install-data-local +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -452,17 +456,21 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-local +uninstall-am: uninstall-local + +.MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ distclean distclean-generic distdir dvi dvi-am html html-am \ info info-am install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-local 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 maintainer-clean-local mostlyclean \ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-local + uninstall-local .po.mo: --- fvwm-2.5.27.ds.orig/tests/Makefile.in +++ fvwm-2.5.27.ds/tests/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -49,10 +45,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -61,8 +60,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -114,10 +111,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -141,6 +134,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -157,6 +151,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -204,9 +199,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -218,6 +215,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -257,10 +255,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -317,7 +318,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -350,8 +350,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -395,8 +394,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -421,8 +420,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -432,13 +431,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -452,22 +450,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -481,7 +478,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -489,6 +486,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -542,12 +541,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -566,21 +573,23 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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 \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/tests/hints/Makefile.in +++ fvwm-2.5.27.ds/tests/hints/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -54,7 +50,7 @@ am__DEPENDENCIES_1 = hints_test_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -70,8 +66,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -123,10 +117,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -150,6 +140,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -166,6 +157,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -213,9 +205,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -227,6 +221,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -266,10 +261,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -334,7 +332,7 @@ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) hints_test$(EXEEXT): $(hints_test_OBJECTS) $(hints_test_DEPENDENCIES) @rm -f hints_test$(EXEEXT) - $(LINK) $(hints_test_LDFLAGS) $(hints_test_OBJECTS) $(hints_test_LDADD) $(LIBS) + $(LINK) $(hints_test_OBJECTS) $(hints_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -345,27 +343,26 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hints_test.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -377,8 +374,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -388,13 +385,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -408,22 +404,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -484,12 +479,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -509,18 +512,22 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstPROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/bin/fvwm-menu-directory.in +++ fvwm-2.5.27.ds/bin/fvwm-menu-directory.in @@ -185,7 +185,7 @@ @files = reverse @files if $order < 0; # dump all menu items and start adding new items -my $menuName = &escapeFvwmName($name); +my $menuName = &escapeFileName($name); my $menuName2 = &escapeMenuName($name); print qq(DestroyMenu recreate "$menuName"\nAddToMenu "$menuName2"\n); --- fvwm-2.5.27.ds.orig/bin/Makefile.in +++ fvwm-2.5.27.ds/bin/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -72,7 +68,7 @@ am__DEPENDENCIES_1 = binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -91,8 +87,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -144,10 +138,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -171,6 +161,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -187,6 +178,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -234,9 +226,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -248,6 +242,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -287,10 +282,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -403,7 +401,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -426,10 +424,10 @@ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) fvwm-root$(EXEEXT): $(fvwm_root_OBJECTS) $(fvwm_root_DEPENDENCIES) @rm -f fvwm-root$(EXEEXT) - $(LINK) $(fvwm_root_LDFLAGS) $(fvwm_root_OBJECTS) $(fvwm_root_LDADD) $(LIBS) + $(LINK) $(fvwm_root_OBJECTS) $(fvwm_root_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -456,22 +454,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fvwm-root.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -520,8 +517,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -533,8 +530,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -544,13 +541,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -564,22 +560,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -595,7 +590,7 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -644,13 +639,21 @@ install-data-am: install-data-local install-man +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS install-binSCRIPTS \ install-exec-local +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -670,24 +673,26 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-info-am uninstall-man +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-binSCRIPTS install-data install-data-am \ - install-data-local install-exec install-exec-am \ - install-exec-local install-info install-info-am install-man \ - install-man1 install-strip installcheck installcheck-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 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 pdf pdf-am \ ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-binSCRIPTS uninstall-info-am uninstall-man \ - uninstall-man1 + uninstall-binSCRIPTS uninstall-man uninstall-man1 _fvwm-menu-xlock.1: fvwm-menu-xlock.in --- fvwm-2.5.27.ds.orig/rpm/Makefile.in +++ fvwm-2.5.27.ds/rpm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -106,10 +100,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -133,6 +123,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -149,6 +140,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -196,9 +188,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -210,6 +204,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -249,10 +244,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -314,7 +312,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh fvwm.spec: $(top_builddir)/config.status $(srcdir)/fvwm.spec.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -uninstall-info-am: tags: TAGS TAGS: @@ -323,22 +320,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -397,12 +393,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -421,16 +425,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am this: @PACKAGE@.spec --- fvwm-2.5.27.ds.orig/modules/Makefile.in +++ fvwm-2.5.27.ds/modules/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -49,10 +45,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -61,8 +60,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -114,10 +111,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -141,6 +134,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -157,6 +151,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -204,9 +199,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -218,6 +215,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -257,10 +255,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -323,7 +324,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -356,8 +356,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -401,8 +400,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -427,8 +426,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -438,13 +437,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -458,22 +456,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -487,7 +484,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -495,6 +492,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -548,12 +547,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -572,21 +579,23 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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 \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmTaskBar/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmTaskBar/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -59,7 +55,7 @@ FvwmTaskBar_OBJECTS = $(am_FvwmTaskBar_OBJECTS) FvwmTaskBar_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -86,8 +82,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -139,10 +133,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -166,6 +156,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -182,6 +173,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -229,9 +221,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -243,6 +237,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -282,10 +277,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -369,7 +367,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -392,7 +390,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmTaskBar$(EXEEXT): $(FvwmTaskBar_OBJECTS) $(FvwmTaskBar_DEPENDENCIES) @rm -f FvwmTaskBar$(EXEEXT) - $(LINK) $(FvwmTaskBar_LDFLAGS) $(FvwmTaskBar_OBJECTS) $(FvwmTaskBar_LDADD) $(LIBS) + $(LINK) $(FvwmTaskBar_OBJECTS) $(FvwmTaskBar_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -408,22 +406,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Start.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -468,7 +465,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -489,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -502,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -513,13 +510,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -533,22 +529,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -564,7 +559,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -612,12 +607,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -637,22 +640,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmDragWell/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmDragWell/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -56,7 +52,7 @@ FvwmDragWell_OBJECTS = $(am_FvwmDragWell_OBJECTS) FvwmDragWell_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -75,8 +71,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -128,10 +122,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -155,6 +145,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -171,6 +162,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -218,9 +210,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -232,6 +226,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -271,10 +266,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -346,7 +344,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -369,7 +367,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmDragWell$(EXEEXT): $(FvwmDragWell_OBJECTS) $(FvwmDragWell_DEPENDENCIES) @rm -f FvwmDragWell$(EXEEXT) - $(LINK) $(FvwmDragWell_LDFLAGS) $(FvwmDragWell_OBJECTS) $(FvwmDragWell_LDADD) $(LIBS) + $(LINK) $(FvwmDragWell_OBJECTS) $(FvwmDragWell_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -382,22 +380,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdndDragSource.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -446,8 +443,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -459,8 +456,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -470,13 +467,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -490,22 +486,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -521,7 +516,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -569,12 +564,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -594,22 +597,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmForm/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmForm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -16,15 +16,11 @@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -61,7 +57,7 @@ am__DEPENDENCIES_1 = moduleSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(module_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -88,8 +84,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -141,10 +135,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -168,6 +158,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -184,6 +175,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -231,9 +223,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -245,6 +239,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -284,10 +279,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -381,7 +379,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -404,10 +402,10 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmForm$(EXEEXT): $(FvwmForm_OBJECTS) $(FvwmForm_DEPENDENCIES) @rm -f FvwmForm$(EXEEXT) - $(LINK) $(FvwmForm_LDFLAGS) $(FvwmForm_OBJECTS) $(FvwmForm_LDADD) $(LIBS) + $(LINK) $(FvwmForm_OBJECTS) $(FvwmForm_LDADD) $(LIBS) install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -436,22 +434,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReadXServer.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -496,7 +493,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -517,8 +514,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -530,8 +527,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -541,13 +538,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -561,22 +557,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -592,7 +587,7 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -642,12 +637,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS \ install-moduleSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -667,24 +670,27 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-moduleSCRIPTS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-moduleSCRIPTS install-strip \ + install-modulePROGRAMS install-moduleSCRIPTS 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-modulePROGRAMS \ - uninstall-moduleSCRIPTS + uninstall-am uninstall-configDATA uninstall-man uninstall-man1 \ + uninstall-modulePROGRAMS uninstall-moduleSCRIPTS FvwmTalk: ../../config.h Makefile --- fvwm-2.5.27.ds.orig/modules/FvwmM4/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmM4/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmM4_OBJECTS = $(am_FvwmM4_OBJECTS) FvwmM4_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -345,7 +343,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -368,7 +366,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmM4$(EXEEXT): $(FvwmM4_OBJECTS) $(FvwmM4_DEPENDENCIES) @rm -f FvwmM4$(EXEEXT) - $(LINK) $(FvwmM4_LDFLAGS) $(FvwmM4_OBJECTS) $(FvwmM4_LDADD) $(LIBS) + $(LINK) $(FvwmM4_OBJECTS) $(FvwmM4_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -379,22 +377,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmM4.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -443,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -456,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -467,13 +464,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -487,22 +483,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -518,7 +513,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -566,12 +561,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -591,22 +594,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmScroll/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmScroll/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,7 +53,7 @@ FvwmScroll_OBJECTS = $(am_FvwmScroll_OBJECTS) FvwmScroll_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -84,8 +80,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -137,10 +131,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -164,6 +154,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -180,6 +171,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -227,9 +219,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -241,6 +235,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -280,10 +275,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -357,7 +355,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -380,7 +378,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmScroll$(EXEEXT): $(FvwmScroll_OBJECTS) $(FvwmScroll_DEPENDENCIES) @rm -f FvwmScroll$(EXEEXT) - $(LINK) $(FvwmScroll_LDFLAGS) $(FvwmScroll_OBJECTS) $(FvwmScroll_LDADD) $(LIBS) + $(LINK) $(FvwmScroll_OBJECTS) $(FvwmScroll_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -392,22 +390,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrabWindow.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -452,7 +449,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -473,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -486,8 +483,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -497,13 +494,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -517,22 +513,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -548,7 +543,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -596,12 +591,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -621,22 +624,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmBanner/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmBanner/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmBanner_OBJECTS = $(am_FvwmBanner_OBJECTS) FvwmBanner_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -345,7 +343,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -368,7 +366,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmBanner$(EXEEXT): $(FvwmBanner_OBJECTS) $(FvwmBanner_DEPENDENCIES) @rm -f FvwmBanner$(EXEEXT) - $(LINK) $(FvwmBanner_LDFLAGS) $(FvwmBanner_OBJECTS) $(FvwmBanner_LDADD) $(LIBS) + $(LINK) $(FvwmBanner_OBJECTS) $(FvwmBanner_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -379,22 +377,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmBanner.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -443,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -456,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -467,13 +464,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -487,22 +483,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -518,7 +513,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -566,12 +561,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -591,22 +594,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmCpp/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmCpp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmCpp_OBJECTS = $(am_FvwmCpp_OBJECTS) FvwmCpp_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -346,7 +344,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -369,7 +367,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmCpp$(EXEEXT): $(FvwmCpp_OBJECTS) $(FvwmCpp_DEPENDENCIES) @rm -f FvwmCpp$(EXEEXT) - $(LINK) $(FvwmCpp_LDFLAGS) $(FvwmCpp_OBJECTS) $(FvwmCpp_LDADD) $(LIBS) + $(LINK) $(FvwmCpp_OBJECTS) $(FvwmCpp_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -380,22 +378,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmCpp.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -444,8 +441,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -457,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -468,13 +465,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -488,22 +484,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -519,7 +514,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -567,12 +562,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -592,22 +595,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmPager/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmPager/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,7 +53,7 @@ FvwmPager_OBJECTS = $(am_FvwmPager_OBJECTS) FvwmPager_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -84,8 +80,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -137,10 +131,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -164,6 +154,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -180,6 +171,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -227,9 +219,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -241,6 +235,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -280,10 +275,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -360,7 +358,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -383,7 +381,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmPager$(EXEEXT): $(FvwmPager_OBJECTS) $(FvwmPager_DEPENDENCIES) @rm -f FvwmPager$(EXEEXT) - $(LINK) $(FvwmPager_LDFLAGS) $(FvwmPager_OBJECTS) $(FvwmPager_LDADD) $(LIBS) + $(LINK) $(FvwmPager_OBJECTS) $(FvwmPager_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -395,22 +393,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x_pager.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -455,7 +452,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -476,8 +473,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -489,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -500,13 +497,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -520,22 +516,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -551,7 +546,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -599,12 +594,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -624,22 +627,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmBacker/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmBacker/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,7 +53,7 @@ FvwmBacker_OBJECTS = $(am_FvwmBacker_OBJECTS) FvwmBacker_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -84,8 +80,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -137,10 +131,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -164,6 +154,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -180,6 +171,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -227,9 +219,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -241,6 +235,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -280,10 +275,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -357,7 +355,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -380,7 +378,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmBacker$(EXEEXT): $(FvwmBacker_OBJECTS) $(FvwmBacker_DEPENDENCIES) @rm -f FvwmBacker$(EXEEXT) - $(LINK) $(FvwmBacker_LDFLAGS) $(FvwmBacker_OBJECTS) $(FvwmBacker_LDADD) $(LIBS) + $(LINK) $(FvwmBacker_OBJECTS) $(FvwmBacker_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -392,22 +390,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/root_bits.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -452,7 +449,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -473,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -486,8 +483,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -497,13 +494,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -517,22 +513,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -548,7 +543,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -596,12 +591,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -621,22 +624,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmTheme/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmTheme/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmTheme_OBJECTS = $(am_FvwmTheme_OBJECTS) FvwmTheme_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -342,7 +340,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -365,7 +363,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmTheme$(EXEEXT): $(FvwmTheme_OBJECTS) $(FvwmTheme_DEPENDENCIES) @rm -f FvwmTheme$(EXEEXT) - $(LINK) $(FvwmTheme_LDFLAGS) $(FvwmTheme_OBJECTS) $(FvwmTheme_LDADD) $(LIBS) + $(LINK) $(FvwmTheme_OBJECTS) $(FvwmTheme_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -376,22 +374,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmTheme.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -440,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -453,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -464,13 +461,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,22 +480,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -515,7 +510,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -563,12 +558,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -588,22 +591,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmWharf/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmWharf/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -56,7 +52,7 @@ FvwmWharf_OBJECTS = $(am_FvwmWharf_OBJECTS) FvwmWharf_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -75,8 +71,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -128,10 +122,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -155,6 +145,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -171,6 +162,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -218,9 +210,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -232,6 +226,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -271,10 +266,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -349,7 +347,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -372,7 +370,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmWharf$(EXEEXT): $(FvwmWharf_OBJECTS) $(FvwmWharf_DEPENDENCIES) @rm -f FvwmWharf$(EXEEXT) - $(LINK) $(FvwmWharf_LDFLAGS) $(FvwmWharf_OBJECTS) $(FvwmWharf_LDADD) $(LIBS) + $(LINK) $(FvwmWharf_OBJECTS) $(FvwmWharf_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -385,22 +383,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stepgfx.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -449,8 +446,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -462,8 +459,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -473,13 +470,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -493,23 +489,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/ASSound $(distdir)/OffiX - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -525,7 +519,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -573,12 +567,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -598,22 +600,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmScript/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmScript/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -56,7 +52,7 @@ FvwmScript_OBJECTS = $(am_FvwmScript_OBJECTS) FvwmScript_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -67,13 +63,16 @@ DIST_SOURCES = $(FvwmScript_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -82,8 +81,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -135,10 +132,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -162,6 +155,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -178,6 +172,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -225,9 +220,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -239,6 +236,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -278,10 +276,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -367,7 +368,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -390,7 +391,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmScript$(EXEEXT): $(FvwmScript_OBJECTS) $(FvwmScript_DEPENDENCIES) @rm -f FvwmScript$(EXEEXT) - $(LINK) $(FvwmScript_LDFLAGS) $(FvwmScript_OBJECTS) $(FvwmScript_LDADD) $(LIBS) + $(LINK) $(FvwmScript_OBJECTS) $(FvwmScript_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -405,22 +406,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -495,8 +495,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -540,8 +539,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -566,8 +565,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -577,13 +576,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -597,22 +595,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -626,7 +623,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -634,6 +631,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -644,7 +643,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -692,12 +691,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: install-man1 +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -717,26 +724,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS - -uninstall-info: uninstall-info-recursive +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-modulePROGRAMS clean-recursive ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-modulePROGRAMS +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic \ + clean-modulePROGRAMS ctags ctags-recursive distclean \ + distclean-compile distclean-generic 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-man1 \ + install-modulePROGRAMS install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-man uninstall-man1 \ + uninstall-modulePROGRAMS .PHONY: syntax --- fvwm-2.5.27.ds.orig/modules/FvwmScript/Scripts/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmScript/Scripts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,8 +58,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +109,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +132,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +197,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +213,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -258,10 +253,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -330,10 +328,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -356,22 +353,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -387,7 +383,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -434,12 +430,20 @@ install-data-am: install-configDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -458,17 +462,20 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am +uninstall-am: uninstall-configDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-configDATA install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA FvwmScript-Setup95: FvwmScript-Setup95.in Makefile --- fvwm-2.5.27.ds.orig/modules/FvwmScript/Widgets/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmScript/Widgets/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -58,7 +54,7 @@ Swallow.$(OBJEXT) TextField.$(OBJEXT) Tools.$(OBJEXT) \ VDipstick.$(OBJEXT) VScrollBar.$(OBJEXT) Widget.$(OBJEXT) libWidgets_a_OBJECTS = $(am_libWidgets_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -369,27 +367,26 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Widget.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -401,8 +398,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -412,13 +409,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -432,22 +428,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -508,12 +503,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -533,18 +536,22 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmSaveDesk/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmSaveDesk/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmSaveDesk_OBJECTS = $(am_FvwmSaveDesk_OBJECTS) FvwmSaveDesk_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -342,7 +340,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -365,7 +363,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmSaveDesk$(EXEEXT): $(FvwmSaveDesk_OBJECTS) $(FvwmSaveDesk_DEPENDENCIES) @rm -f FvwmSaveDesk$(EXEEXT) - $(LINK) $(FvwmSaveDesk_LDFLAGS) $(FvwmSaveDesk_OBJECTS) $(FvwmSaveDesk_LDADD) $(LIBS) + $(LINK) $(FvwmSaveDesk_OBJECTS) $(FvwmSaveDesk_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -376,22 +374,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmSaveDesk.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -440,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -453,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -464,13 +461,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,23 +480,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/example - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -516,7 +510,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -564,12 +558,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -589,22 +591,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmAnimate/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmAnimate/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmAnimate_OBJECTS = $(am_FvwmAnimate_OBJECTS) FvwmAnimate_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -345,7 +343,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -368,7 +366,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmAnimate$(EXEEXT): $(FvwmAnimate_OBJECTS) $(FvwmAnimate_DEPENDENCIES) @rm -f FvwmAnimate$(EXEEXT) - $(LINK) $(FvwmAnimate_LDFLAGS) $(FvwmAnimate_OBJECTS) $(FvwmAnimate_LDADD) $(LIBS) + $(LINK) $(FvwmAnimate_OBJECTS) $(FvwmAnimate_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -379,22 +377,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmAnimate.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -443,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -456,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -467,13 +464,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -487,22 +483,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -518,7 +513,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -566,12 +561,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -591,22 +594,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmPerl/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmPerl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -60,8 +56,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -113,10 +107,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -140,6 +130,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -156,6 +147,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -203,9 +195,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -217,6 +211,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -256,10 +251,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -322,7 +320,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -339,10 +337,9 @@ echo " rm -f '$(DESTDIR)$(moduledir)/$$f'"; \ rm -f "$(DESTDIR)$(moduledir)/$$f"; \ done -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -393,22 +390,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -424,7 +420,7 @@ all-am: Makefile $(SCRIPTS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -470,12 +466,20 @@ install-data-am: install-man install-moduleSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -494,19 +498,23 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-moduleSCRIPTS +uninstall-am: uninstall-man uninstall-moduleSCRIPTS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-man1 install-moduleSCRIPTS install-strip installcheck \ + 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-man1 install-moduleSCRIPTS install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-moduleSCRIPTS + pdf-am ps ps-am uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-moduleSCRIPTS _FvwmPerl.1: FvwmPerl.in --- fvwm-2.5.27.ds.orig/modules/FvwmIconMan/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmIconMan/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -60,7 +56,7 @@ FvwmIconMan_OBJECTS = $(am_FvwmIconMan_OBJECTS) FvwmIconMan_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -87,8 +83,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -140,10 +134,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -167,6 +157,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -183,6 +174,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -230,9 +222,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -244,6 +238,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -283,10 +278,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -365,7 +363,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -388,7 +386,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmIconMan$(EXEEXT): $(FvwmIconMan_OBJECTS) $(FvwmIconMan_DEPENDENCIES) @rm -f FvwmIconMan$(EXEEXT) - $(LINK) $(FvwmIconMan_LDFLAGS) $(FvwmIconMan_OBJECTS) $(FvwmIconMan_LDADD) $(LIBS) + $(LINK) $(FvwmIconMan_OBJECTS) $(FvwmIconMan_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -407,22 +405,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmanager.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -467,7 +464,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -488,8 +485,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -501,8 +498,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -512,13 +509,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -532,22 +528,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -563,7 +558,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -611,12 +606,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -636,22 +639,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmSave/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmSave/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmSave_OBJECTS = $(am_FvwmSave_OBJECTS) FvwmSave_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -342,7 +340,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -365,7 +363,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmSave$(EXEEXT): $(FvwmSave_OBJECTS) $(FvwmSave_DEPENDENCIES) @rm -f FvwmSave$(EXEEXT) - $(LINK) $(FvwmSave_LDFLAGS) $(FvwmSave_OBJECTS) $(FvwmSave_LDADD) $(LIBS) + $(LINK) $(FvwmSave_OBJECTS) $(FvwmSave_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -376,22 +374,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmSave.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -440,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -453,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -464,13 +461,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,22 +480,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -515,7 +510,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -563,12 +558,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -588,22 +591,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmAuto/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmAuto/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmAuto_OBJECTS = $(am_FvwmAuto_OBJECTS) FvwmAuto_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -342,7 +340,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -365,7 +363,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmAuto$(EXEEXT): $(FvwmAuto_OBJECTS) $(FvwmAuto_DEPENDENCIES) @rm -f FvwmAuto$(EXEEXT) - $(LINK) $(FvwmAuto_LDFLAGS) $(FvwmAuto_OBJECTS) $(FvwmAuto_LDADD) $(LIBS) + $(LINK) $(FvwmAuto_OBJECTS) $(FvwmAuto_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -376,22 +374,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmAuto.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -440,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -453,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -464,13 +461,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,22 +480,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -515,7 +510,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -563,12 +558,20 @@ install-data-am: install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -588,22 +591,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS +uninstall-am: uninstall-man uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-modulePROGRAMS + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/modules/FvwmCommand/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmCommand/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -61,7 +57,7 @@ am_FvwmCommandS_OBJECTS = FvwmCommandS.$(OBJEXT) fifos.$(OBJEXT) FvwmCommandS_OBJECTS = $(am_FvwmCommandS_OBJECTS) FvwmCommandS_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -72,10 +68,11 @@ DIST_SOURCES = $(FvwmCommand_SOURCES) $(FvwmCommandS_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -87,6 +84,8 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; moduleDATA_INSTALL = $(INSTALL_DATA) DATA = $(module_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -95,8 +94,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -148,10 +145,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -175,6 +168,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -191,6 +185,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -238,9 +233,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -252,6 +249,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -291,10 +289,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -370,7 +371,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -393,7 +394,7 @@ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -416,10 +417,10 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmCommand$(EXEEXT): $(FvwmCommand_OBJECTS) $(FvwmCommand_DEPENDENCIES) @rm -f FvwmCommand$(EXEEXT) - $(LINK) $(FvwmCommand_LDFLAGS) $(FvwmCommand_OBJECTS) $(FvwmCommand_LDADD) $(LIBS) + $(LINK) $(FvwmCommand_OBJECTS) $(FvwmCommand_LDADD) $(LIBS) FvwmCommandS$(EXEEXT): $(FvwmCommandS_OBJECTS) $(FvwmCommandS_DEPENDENCIES) @rm -f FvwmCommandS$(EXEEXT) - $(LINK) $(FvwmCommandS_LDFLAGS) $(FvwmCommandS_OBJECTS) $(FvwmCommandS_LDADD) $(LIBS) + $(LINK) $(FvwmCommandS_OBJECTS) $(FvwmCommandS_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -432,22 +433,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fifos.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -492,7 +492,7 @@ done install-moduleDATA: $(module_DATA) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -539,8 +539,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -584,8 +583,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -610,8 +609,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -621,13 +620,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -641,22 +639,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -670,7 +667,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -678,6 +675,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -688,7 +687,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(moduledir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -738,12 +737,20 @@ install-data-am: install-man install-moduleDATA install-modulePROGRAMS +install-dvi: install-dvi-recursive + install-exec-am: install-binPROGRAMS +install-html: install-html-recursive + install-info: install-info-recursive install-man: install-man1 +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -763,29 +770,30 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \ - uninstall-moduleDATA uninstall-modulePROGRAMS - -uninstall-info: uninstall-info-recursive +uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-moduleDATA \ + uninstall-modulePROGRAMS uninstall-man: uninstall-man1 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-binPROGRAMS clean-generic clean-modulePROGRAMS \ - clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-recursive \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-man1 install-moduleDATA \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-moduleDATA \ - uninstall-modulePROGRAMS +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-modulePROGRAMS ctags ctags-recursive \ + distclean distclean-compile distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-binPROGRAMS 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-man1 install-moduleDATA \ + install-modulePROGRAMS install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \ + uninstall-man1 uninstall-moduleDATA uninstall-modulePROGRAMS FvwmCommand.sh: findcmd.pl $(top_srcdir)/fvwm/functable.c --- fvwm-2.5.27.ds.orig/modules/FvwmCommand/scripts/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmCommand/scripts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -54,8 +50,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -107,10 +101,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -134,6 +124,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -150,6 +141,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -197,9 +189,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -211,6 +205,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -250,10 +245,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -317,7 +315,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -326,22 +323,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -401,12 +397,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -425,16 +429,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am .pl: @rm -f $@ --- fvwm-2.5.27.ds.orig/modules/FvwmIconBox/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmIconBox/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,7 +53,7 @@ FvwmIconBox_OBJECTS = $(am_FvwmIconBox_OBJECTS) FvwmIconBox_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -84,8 +80,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -137,10 +131,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -164,6 +154,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -180,6 +171,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -227,9 +219,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -241,6 +235,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -280,10 +275,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -360,7 +358,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -383,7 +381,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmIconBox$(EXEEXT): $(FvwmIconBox_OBJECTS) $(FvwmIconBox_DEPENDENCIES) @rm -f FvwmIconBox$(EXEEXT) - $(LINK) $(FvwmIconBox_LDFLAGS) $(FvwmIconBox_OBJECTS) $(FvwmIconBox_LDADD) $(LIBS) + $(LINK) $(FvwmIconBox_OBJECTS) $(FvwmIconBox_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -395,22 +393,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icons.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -455,7 +452,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -476,8 +473,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -489,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -500,13 +497,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -520,22 +516,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -551,7 +546,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -599,12 +594,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -624,22 +627,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmWinList/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmWinList/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -58,7 +54,7 @@ FvwmWinList_OBJECTS = $(am_FvwmWinList_OBJECTS) FvwmWinList_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -85,8 +81,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -138,10 +132,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -165,6 +155,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -181,6 +172,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -228,9 +220,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -242,6 +236,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -281,10 +276,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -363,7 +361,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -386,7 +384,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmWinList$(EXEEXT): $(FvwmWinList_OBJECTS) $(FvwmWinList_DEPENDENCIES) @rm -f FvwmWinList$(EXEEXT) - $(LINK) $(FvwmWinList_LDFLAGS) $(FvwmWinList_OBJECTS) $(FvwmWinList_LDADD) $(LIBS) + $(LINK) $(FvwmWinList_OBJECTS) $(FvwmWinList_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -400,22 +398,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mallocs.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -460,7 +457,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -481,8 +478,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -494,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -505,13 +502,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -525,22 +521,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -556,7 +551,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -604,12 +599,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -629,22 +632,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmRearrange/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmRearrange/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -59,7 +55,7 @@ am__DEPENDENCIES_1 = moduleSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(module_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -78,8 +74,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -131,10 +125,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -158,6 +148,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -174,6 +165,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -221,9 +213,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -235,6 +229,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -274,10 +269,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -348,7 +346,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -371,10 +369,10 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmRearrange$(EXEEXT): $(FvwmRearrange_OBJECTS) $(FvwmRearrange_DEPENDENCIES) @rm -f FvwmRearrange$(EXEEXT) - $(LINK) $(FvwmRearrange_LDFLAGS) $(FvwmRearrange_OBJECTS) $(FvwmRearrange_LDADD) $(LIBS) + $(LINK) $(FvwmRearrange_OBJECTS) $(FvwmRearrange_LDADD) $(LIBS) install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -401,22 +399,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmRearrange.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -465,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -478,8 +475,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -489,13 +486,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -509,22 +505,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -540,7 +535,7 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -590,12 +585,20 @@ install-data-am: install-man install-modulePROGRAMS \ install-moduleSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -615,22 +618,26 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS \ +uninstall-am: uninstall-man uninstall-modulePROGRAMS \ uninstall-moduleSCRIPTS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-moduleSCRIPTS install-strip \ + install-modulePROGRAMS install-moduleSCRIPTS 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ + uninstall-am uninstall-man uninstall-man1 \ uninstall-modulePROGRAMS uninstall-moduleSCRIPTS --- fvwm-2.5.27.ds.orig/modules/FvwmIdent/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmIdent/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,7 +53,7 @@ FvwmIdent_OBJECTS = $(am_FvwmIdent_OBJECTS) FvwmIdent_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -84,8 +80,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -137,10 +131,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -164,6 +154,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -180,6 +171,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -227,9 +219,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -241,6 +235,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -280,10 +275,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -359,7 +357,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -382,7 +380,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmIdent$(EXEEXT): $(FvwmIdent_OBJECTS) $(FvwmIdent_DEPENDENCIES) @rm -f FvwmIdent$(EXEEXT) - $(LINK) $(FvwmIdent_LDFLAGS) $(FvwmIdent_OBJECTS) $(FvwmIdent_LDADD) $(LIBS) + $(LINK) $(FvwmIdent_OBJECTS) $(FvwmIdent_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -393,22 +391,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmIdent.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -453,7 +450,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -474,8 +471,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -487,8 +484,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -498,13 +495,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -518,22 +514,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -549,7 +544,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -597,12 +592,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -622,22 +625,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmConsole/FvwmConsole.h +++ fvwm-2.5.27.ds/modules/FvwmConsole/FvwmConsole.h @@ -33,7 +33,8 @@ /* #define M_PASS M_ERROR */ #define M_PASS M_ERROR -#define XTERM "xterm" +/* #define XTERM "xterm" */ +#define XTERM "x-terminal-emulator" /* Debian specific chage for policy */ /* message to client */ #define C_BEG "_C_Config_Line_Begin_\n" --- fvwm-2.5.27.ds.orig/modules/FvwmConsole/FvwmConsole.c +++ fvwm-2.5.27.ds/modules/FvwmConsole/FvwmConsole.c @@ -91,7 +91,8 @@ char client[120]; char **eargv; int i, j, k; - char *xterm_pre[] = { "-title", Name, "-name", Name, NULL }; + /* char *xterm_pre[] = { "-title", Name, "-name", Name, NULL }; */ + char *xterm_pre[] = { "-T", Name, NULL }; /* x-terminal-emulator options */ char *xterm_post[] = { "-e", NULL, NULL }; int clpid; --- fvwm-2.5.27.ds.orig/modules/FvwmConsole/FvwmConsole.1 +++ fvwm-2.5.27.ds/modules/FvwmConsole/FvwmConsole.1 @@ -37,7 +37,9 @@ A different terminal emulator can be specified with the -terminal option. However, only terminal programs that understand the options --name, -title and -e can be used. +-name, -title and -e can be used. Debian specific: hardcoded xterm is +changed to x-terminal-emulator. To be policy compliant -name option is +removed from default options and -title is changed to -T. .RS Module FvwmConsole -terminal rxvt --- fvwm-2.5.27.ds.orig/modules/FvwmConsole/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmConsole/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -63,7 +59,7 @@ FvwmConsoleC_LDADD = $(LDADD) moduleSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(module_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -82,8 +78,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -135,10 +129,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -162,6 +152,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -178,6 +169,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -225,9 +217,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -239,6 +233,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -278,10 +273,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -361,7 +359,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -384,13 +382,13 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmConsole$(EXEEXT): $(FvwmConsole_OBJECTS) $(FvwmConsole_DEPENDENCIES) @rm -f FvwmConsole$(EXEEXT) - $(LINK) $(FvwmConsole_LDFLAGS) $(FvwmConsole_OBJECTS) $(FvwmConsole_LDADD) $(LIBS) + $(LINK) $(FvwmConsole_OBJECTS) $(FvwmConsole_LDADD) $(LIBS) FvwmConsoleC$(EXEEXT): $(FvwmConsoleC_OBJECTS) $(FvwmConsoleC_DEPENDENCIES) @rm -f FvwmConsoleC$(EXEEXT) - $(LINK) $(FvwmConsoleC_LDFLAGS) $(FvwmConsoleC_OBJECTS) $(FvwmConsoleC_LDADD) $(LIBS) + $(LINK) $(FvwmConsoleC_OBJECTS) $(FvwmConsoleC_LDADD) $(LIBS) install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -419,22 +417,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -483,8 +480,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -496,8 +493,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -507,13 +504,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -527,22 +523,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -558,7 +553,7 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -607,12 +602,20 @@ install-data-am: install-man install-modulePROGRAMS \ install-moduleSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -632,22 +635,26 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-modulePROGRAMS \ +uninstall-am: uninstall-man uninstall-modulePROGRAMS \ uninstall-moduleSCRIPTS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 \ - install-modulePROGRAMS install-moduleSCRIPTS install-strip \ + install-modulePROGRAMS install-moduleSCRIPTS 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ + uninstall-am uninstall-man uninstall-man1 \ uninstall-modulePROGRAMS uninstall-moduleSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmDebug/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmDebug/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -54,7 +50,7 @@ am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" moduleSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(module_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -73,8 +69,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -126,10 +120,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -153,6 +143,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,6 +160,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -216,9 +208,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -230,6 +224,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -269,10 +264,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -346,10 +344,10 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ FvwmOldDebug$(EXEEXT): $(FvwmOldDebug_OBJECTS) $(FvwmOldDebug_DEPENDENCIES) @rm -f FvwmOldDebug$(EXEEXT) - $(LINK) $(FvwmOldDebug_LDFLAGS) $(FvwmOldDebug_OBJECTS) $(FvwmOldDebug_LDADD) $(LIBS) + $(LINK) $(FvwmOldDebug_OBJECTS) $(FvwmOldDebug_LDADD) $(LIBS) install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -376,22 +374,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmOldDebug.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -440,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -453,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -464,13 +461,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,22 +480,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -515,7 +510,7 @@ all-am: Makefile $(SCRIPTS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -563,12 +558,20 @@ install-data-am: install-man install-moduleSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -588,20 +591,24 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-moduleSCRIPTS +uninstall-am: uninstall-man uninstall-moduleSCRIPTS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ctags distclean distclean-compile distclean-generic \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-man1 install-moduleSCRIPTS install-strip installcheck \ + 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-man1 install-moduleSCRIPTS 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ + uninstall-am uninstall-man uninstall-man1 \ uninstall-moduleSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmGtk/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmGtk/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -37,7 +33,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -module_PROGRAMS = @FVWMGTK@ EXTRA_PROGRAMS = FvwmGtk$(EXEEXT) subdir = modules/FvwmGtk DIST_COMMON = $(srcdir)/FvwmGtk.1.in $(srcdir)/Makefile.am \ @@ -59,7 +54,7 @@ FvwmGtk_OBJECTS = $(am_FvwmGtk_OBJECTS) FvwmGtk_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -83,8 +78,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -136,10 +129,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -163,6 +152,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,6 +169,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -226,9 +217,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -240,6 +233,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -279,10 +273,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -306,6 +303,7 @@ xpm_CFLAGS = @xpm_CFLAGS@ xpm_LIBS = @xpm_LIBS@ moduledir = @FVWM_MODULEDIR@ +module_PROGRAMS = @FVWMGTK@ # DV: For some reason, using man_MANS does not work here: automake does not # generate an install rule for man pages unless one of them is an existing file @@ -364,7 +362,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -387,7 +385,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmGtk$(EXEEXT): $(FvwmGtk_OBJECTS) $(FvwmGtk_DEPENDENCIES) @rm -f FvwmGtk$(EXEEXT) - $(LINK) $(FvwmGtk_LDFLAGS) $(FvwmGtk_OBJECTS) $(FvwmGtk_LDADD) $(LIBS) + $(LINK) $(FvwmGtk_OBJECTS) $(FvwmGtk_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -403,22 +401,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowlist.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man_oneDATA: $(man_one_DATA) @$(NORMAL_INSTALL) - test -z "$(man_onedir)" || $(mkdir_p) "$(DESTDIR)$(man_onedir)" + test -z "$(man_onedir)" || $(MKDIR_P) "$(DESTDIR)$(man_onedir)" @list='$(man_one_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -439,8 +436,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -452,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -463,13 +460,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -483,22 +479,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -514,7 +509,7 @@ all-am: Makefile $(PROGRAMS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man_onedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -563,12 +558,20 @@ install-data-am: install-man_oneDATA install-modulePROGRAMS +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -588,20 +591,22 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man_oneDATA \ - uninstall-modulePROGRAMS +uninstall-am: uninstall-man_oneDATA uninstall-modulePROGRAMS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-local clean-modulePROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-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-man_oneDATA \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man_oneDATA \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-man_oneDATA \ uninstall-modulePROGRAMS --- fvwm-2.5.27.ds.orig/modules/FvwmProxy/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmProxy/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,7 +53,7 @@ FvwmProxy_OBJECTS = $(am_FvwmProxy_OBJECTS) FvwmProxy_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -84,8 +80,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -137,10 +131,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -164,6 +154,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -180,6 +171,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -227,9 +219,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -241,6 +235,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -280,10 +275,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -360,7 +358,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -383,7 +381,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmProxy$(EXEEXT): $(FvwmProxy_OBJECTS) $(FvwmProxy_DEPENDENCIES) @rm -f FvwmProxy$(EXEEXT) - $(LINK) $(FvwmProxy_LDFLAGS) $(FvwmProxy_OBJECTS) $(FvwmProxy_LDADD) $(LIBS) + $(LINK) $(FvwmProxy_OBJECTS) $(FvwmProxy_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -394,22 +392,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmProxy.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -454,7 +451,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -475,8 +472,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -488,8 +485,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -499,13 +496,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -519,22 +515,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -550,7 +545,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -598,12 +593,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -623,22 +626,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmWindowMenu/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmWindowMenu/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -60,8 +56,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -113,10 +107,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -140,6 +130,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -156,6 +147,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -203,9 +195,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -217,6 +211,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -256,10 +251,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -322,7 +320,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -339,10 +337,9 @@ echo " rm -f '$(DESTDIR)$(moduledir)/$$f'"; \ rm -f "$(DESTDIR)$(moduledir)/$$f"; \ done -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -393,22 +390,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -424,7 +420,7 @@ all-am: Makefile $(SCRIPTS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -470,12 +466,20 @@ install-data-am: install-man install-moduleSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -494,19 +498,23 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-moduleSCRIPTS +uninstall-am: uninstall-man uninstall-moduleSCRIPTS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-man1 install-moduleSCRIPTS install-strip installcheck \ + 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-man1 install-moduleSCRIPTS install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-moduleSCRIPTS + pdf-am ps ps-am uninstall uninstall-am uninstall-man \ + uninstall-man1 uninstall-moduleSCRIPTS _FvwmWindowMenu.1: FvwmWindowMenu.in --- fvwm-2.5.27.ds.orig/modules/FvwmEvent/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmEvent/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ FvwmEvent_OBJECTS = $(am_FvwmEvent_OBJECTS) FvwmEvent_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,8 +70,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +121,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +144,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +161,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +209,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +225,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -270,10 +265,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -342,7 +340,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-moduleexecPROGRAMS: $(moduleexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduleexecdir)" || $(mkdir_p) "$(DESTDIR)$(moduleexecdir)" + test -z "$(moduleexecdir)" || $(MKDIR_P) "$(DESTDIR)$(moduleexecdir)" @list='$(moduleexec_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -365,7 +363,7 @@ -test -z "$(moduleexec_PROGRAMS)" || rm -f $(moduleexec_PROGRAMS) FvwmEvent$(EXEEXT): $(FvwmEvent_OBJECTS) $(FvwmEvent_DEPENDENCIES) @rm -f FvwmEvent$(EXEEXT) - $(LINK) $(FvwmEvent_LDFLAGS) $(FvwmEvent_OBJECTS) $(FvwmEvent_LDADD) $(LIBS) + $(LINK) $(FvwmEvent_OBJECTS) $(FvwmEvent_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -376,22 +374,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FvwmEvent.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -440,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -453,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -464,13 +461,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,22 +480,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -515,7 +510,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(moduleexecdir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -563,12 +558,20 @@ install-data-am: install-man +install-dvi: install-dvi-am + install-exec-am: install-exec-local install-moduleexecPROGRAMS +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -588,22 +591,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-man \ - uninstall-moduleexecPROGRAMS +uninstall-am: uninstall-man uninstall-moduleexecPROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-moduleexecPROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-exec-local install-info install-info-am install-man \ - install-man1 install-moduleexecPROGRAMS install-strip \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-moduleexecPROGRAMS 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ + uninstall-am uninstall-man uninstall-man1 \ uninstall-moduleexecPROGRAMS --- fvwm-2.5.27.ds.orig/modules/FvwmButtons/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmButtons/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -59,7 +55,7 @@ FvwmButtons_OBJECTS = $(am_FvwmButtons_OBJECTS) FvwmButtons_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -86,8 +82,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -139,10 +133,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -166,6 +156,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -182,6 +173,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -229,9 +221,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -243,6 +237,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -282,10 +277,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -364,7 +362,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-modulePROGRAMS: $(module_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -387,7 +385,7 @@ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS) FvwmButtons$(EXEEXT): $(FvwmButtons_OBJECTS) $(FvwmButtons_DEPENDENCIES) @rm -f FvwmButtons$(EXEEXT) - $(LINK) $(FvwmButtons_LDFLAGS) $(FvwmButtons_OBJECTS) $(FvwmButtons_LDADD) $(LIBS) + $(LINK) $(FvwmButtons_OBJECTS) $(FvwmButtons_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -405,22 +403,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -465,7 +462,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -486,8 +483,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -499,8 +496,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -510,13 +507,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -530,22 +526,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -561,7 +556,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -609,12 +604,20 @@ install-data-am: install-configDATA install-man install-modulePROGRAMS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -634,22 +637,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-modulePROGRAMS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-modulePROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-configDATA \ - install-data install-data-am install-exec install-exec-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-man1 \ - install-modulePROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-configDATA uninstall-info-am \ + install-modulePROGRAMS 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-configDATA \ uninstall-man uninstall-man1 uninstall-modulePROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- fvwm-2.5.27.ds.orig/modules/FvwmTabs/Makefile.in +++ fvwm-2.5.27.ds/modules/FvwmTabs/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -70,8 +66,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -123,10 +117,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -150,6 +140,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -166,6 +157,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -213,9 +205,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -227,6 +221,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -266,10 +261,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -335,7 +333,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -352,10 +350,9 @@ echo " rm -f '$(DESTDIR)$(moduledir)/$$f'"; \ rm -f "$(DESTDIR)$(moduledir)/$$f"; \ done -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -400,7 +397,7 @@ done install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -423,22 +420,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -454,7 +450,7 @@ all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -500,12 +496,20 @@ install-data-am: install-configDATA install-man install-moduleSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -524,21 +528,25 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am uninstall-man \ +uninstall-am: uninstall-configDATA uninstall-man \ uninstall-moduleSCRIPTS uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-configDATA install-data \ - install-data-am install-exec install-exec-am install-info \ + 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-man1 install-moduleSCRIPTS \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-configDATA uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-moduleSCRIPTS + uninstall-configDATA uninstall-man uninstall-man1 \ + uninstall-moduleSCRIPTS _FvwmTabs.1: $(srcdir)/FvwmTabs.pod --- fvwm-2.5.27.ds.orig/utils/Makefile.in +++ fvwm-2.5.27.ds/utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,7 +49,7 @@ xselection_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -69,8 +65,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -122,10 +116,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -149,6 +139,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -165,6 +156,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -212,9 +204,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -226,6 +220,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -265,10 +260,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -333,7 +331,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh xselection$(EXEEXT): $(xselection_OBJECTS) $(xselection_DEPENDENCIES) @rm -f xselection$(EXEEXT) - $(LINK) $(xselection_LDFLAGS) $(xselection_OBJECTS) $(xselection_LDADD) $(LIBS) + $(LINK) $(xselection_OBJECTS) $(xselection_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -344,27 +342,26 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselection.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -376,8 +373,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -387,13 +384,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -407,22 +403,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -483,12 +478,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -508,17 +511,21 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ctags distclean distclean-compile distclean-generic \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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 pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am + tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/perllib/Makefile.in +++ fvwm-2.5.27.ds/perllib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -49,10 +45,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -61,8 +60,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -114,10 +111,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -141,6 +134,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -157,6 +151,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -204,9 +199,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -218,6 +215,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -257,10 +255,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -316,7 +317,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -349,8 +349,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -394,8 +393,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -420,8 +419,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -431,13 +430,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -451,22 +449,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -480,7 +477,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -488,6 +485,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -541,12 +540,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -565,21 +572,23 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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 \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/perllib/General/Makefile.in +++ fvwm-2.5.27.ds/perllib/General/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,8 +58,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +109,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +132,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +197,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +213,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -258,10 +253,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -319,10 +317,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -345,22 +342,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -376,7 +372,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -422,12 +418,20 @@ install-data-am: install-configDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -446,17 +450,20 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am +uninstall-am: uninstall-configDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-configDATA install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/perllib/FVWM/Makefile.in +++ fvwm-2.5.27.ds/perllib/FVWM/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,10 +47,11 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -64,6 +61,8 @@ am__installdirs = "$(DESTDIR)$(configdir)" configDATA_INSTALL = $(INSTALL_DATA) DATA = $(config_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -72,8 +71,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -125,10 +122,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -152,6 +145,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -168,6 +162,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -215,9 +210,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -229,6 +226,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -268,10 +266,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -335,10 +336,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh Module.pm: $(top_builddir)/config.status $(srcdir)/Module.pm.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -uninstall-info-am: install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -385,8 +385,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -430,8 +429,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -456,8 +455,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -467,13 +466,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -487,22 +485,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -516,7 +513,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -524,6 +521,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -534,7 +533,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -580,12 +579,20 @@ install-data-am: install-configDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -604,22 +611,24 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am +uninstall-am: uninstall-configDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ install-am install-configDATA install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-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 installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-configDATA uninstall-info-am + uninstall-configDATA _Constants.pm: Makefile.am $(top_srcdir)/libs/Module.h --- fvwm-2.5.27.ds.orig/perllib/FVWM/Module/Makefile.in +++ fvwm-2.5.27.ds/perllib/FVWM/Module/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,8 +58,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +109,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +132,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +197,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +213,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -258,10 +253,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -319,10 +317,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -345,22 +342,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -376,7 +372,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -422,12 +418,20 @@ install-data-am: install-configDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -446,17 +450,20 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am +uninstall-am: uninstall-configDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-configDATA install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/perllib/FVWM/Tracker/Makefile.in +++ fvwm-2.5.27.ds/perllib/FVWM/Tracker/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,8 +58,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +109,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +132,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +197,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +213,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -258,10 +253,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -322,10 +320,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -348,22 +345,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -379,7 +375,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -425,12 +421,20 @@ install-data-am: install-configDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -449,17 +453,20 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am +uninstall-am: uninstall-configDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-configDATA install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/fvwm/fvwm.c +++ fvwm-2.5.27.ds/fvwm/fvwm.c @@ -1383,6 +1383,8 @@ { "TitleStyle Centered -- Raised", "", "" }, { "Style * Color lightgrey/dimgrey", "", "" }, { "Style * HilightFore black, HilightBack grey", "", "" }, + { "Read /etc/X11/fvwm/menudefs.hook Quiet", "", "" }, + { "Read menudefs.hook Quiet", "", "" }, { "AddToMenu MenuFvwmRoot \"", _("Builtin Menu"), @@ -1405,6 +1407,11 @@ "\" Module FvwmConsole" }, { + "+ \"&D. ", + _("Debian Menu"), + "\" Popup /Debian" + }, + { "+ \"&R. ", _("Restart fvwm"), "\" Restart" --- fvwm-2.5.27.ds.orig/fvwm/Makefile.in +++ fvwm-2.5.27.ds/fvwm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -72,7 +68,7 @@ fvwm_OBJECTS = $(am_fvwm_OBJECTS) fvwm_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -96,8 +92,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -149,10 +143,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -176,6 +166,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -192,6 +183,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -239,9 +231,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -253,6 +247,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -292,10 +287,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -396,7 +394,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -419,7 +417,7 @@ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) fvwm$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES) @rm -f fvwm$(EXEEXT) - $(LINK) $(fvwm_LDFLAGS) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS) + $(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -480,22 +478,21 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowshade.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -516,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -529,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -540,13 +537,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -560,22 +556,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -591,7 +586,7 @@ all-am: Makefile $(PROGRAMS) $(DATA) installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -639,12 +634,20 @@ install-data-am: install-configDATA +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS install-exec-local +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -664,21 +667,23 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-configDATA \ - uninstall-info-am +uninstall-am: uninstall-binPROGRAMS uninstall-configDATA + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-configDATA install-data install-data-am install-exec \ - install-exec-am install-exec-local install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-configDATA \ - uninstall-info-am + install-configDATA install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-exec-local \ + 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 pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-configDATA install-exec-local: --- fvwm-2.5.27.ds.orig/fvwm/ConfigFvwmSetup +++ fvwm-2.5.27.ds/fvwm/ConfigFvwmSetup @@ -24,6 +24,7 @@ Style * IconBox 0 -10 -280 -1 Style * FocusFollowsMouse Style * TileCascadePlacement +Style * EWMHUseStackingOrderHints # Styles for various Fvwm modules: Style Fvwm* NoTitle, Sticky, WindowListSkip @@ -48,6 +49,7 @@ Style xmag Icon mag_glass.xpm, ClickToFocus Style xgraph Icon graphs.xpm, ClickToFocus Style xmosaic Color Green/Yellow, ClickToFocus +Style OpenOffice* NoFuncHint # some simple default key bindings: @@ -87,11 +89,16 @@ + I Nop ######################## Menus ################### +Read /etc/X11/fvwm/menudefs.hook Quiet +Read menudefs.hook Quiet + DestroyMenu MenuFvwmRoot AddToMenu MenuFvwmRoot "$[gt.Root Menu]" Title + "&1. XTerm" Exec exec xterm + "&2. Rxvt" Exec exec rxvt + "" Nop ++ "&D. Debian Menu" Popup "/Debian" ++ "" Nop + "&R. $[gt.Remote Logins]" Popup MenuFvwmLogins + "" Nop + "&U. $[gt.Utilities]" Popup MenuFvwmUtilities --- fvwm-2.5.27.ds.orig/sample.fvwmrc/Makefile.in +++ fvwm-2.5.27.ds/sample.fvwmrc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,8 +58,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +109,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +132,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +197,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +213,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -258,10 +253,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -322,10 +320,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -348,22 +345,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -379,7 +375,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(configdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -425,12 +421,20 @@ install-data-am: install-configDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -449,17 +453,20 @@ ps-am: -uninstall-am: uninstall-configDATA uninstall-info-am +uninstall-am: uninstall-configDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-configDATA install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-configDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/libs/Makefile.in +++ fvwm-2.5.27.ds/libs/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -73,7 +69,7 @@ modifiers.$(OBJEXT) fsm.$(OBJEXT) FTips.$(OBJEXT) \ fio.$(OBJEXT) fvwmlib.$(OBJEXT) libfvwm_a_OBJECTS = $(am_libfvwm_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -89,8 +85,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -142,10 +136,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -169,6 +159,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -185,6 +176,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -232,9 +224,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -246,6 +240,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -285,10 +280,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -452,27 +450,26 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wild.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -484,8 +481,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -495,13 +492,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -515,22 +511,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -591,12 +586,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -616,18 +619,22 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + 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 pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/debian/watch +++ fvwm-2.5.27.ds/debian/watch @@ -0,0 +1,6 @@ +# format version number, currently 2; this line is compulsory! +version=3 +opts=dversionmangle=s/\.ds// \ + http://www.fvwm.org/download/ \ + ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-([\d\.]*)\.tar\.gz + --- fvwm-2.5.27.ds.orig/debian/postinst +++ fvwm-2.5.27.ds/debian/postinst @@ -0,0 +1,279 @@ +#! /bin/sh +# -*- Mode: Sh -*- +# postinst --- +# Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +# Created On : Fri Nov 14 11:25:07 2003 +# Created On Node : glaurung.green-gryphon.com +# Last Modified By : Manoj Srivastava +# Last Modified On : Fri Sep 21 02:37:57 2007 +# Last Machine Used: anzu.internal.golden-gryphon.com +# Update Count : 32 +# Status : Unknown, Use with caution! +# HISTORY : +# Description : +# +# arch-tag: 5401e9ef-39cc-4aee-96a4-61dfb8f32cf7 +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# + +# Abort if any command returns an error value +set -e + +package_name=fvwm + +if [ -z "$package_name" ]; then + print >&2 "Internal Error. Please report a bug." + exit 1; +fi + +# This script is called as the last step of the installation of the +# package. All the package's files are in place, dpkg has already done +# its automatic conffile handling, and all the packages we depend of +# are already fully installed and configured. +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +# The following idempotent stuff doesn't generally need protecting +# against being run in the abort-* cases. + +# Install info files into the dir file +##: install-info --quiet --section "section pattern" "Section Title" \ +##: --description="Name of the document" /usr/info/${package_name}.info + +# Create stub directories under /usr/local +##: if test ! -d /usr/local/lib/${package_name}; then +##: if test ! -d /usr/local/lib; then +##: if mkdir /usr/local/lib; then +##: chown root.staff /usr/local/lib || true +##: chmod 2775 /usr/local/lib || true +##: fi +##: fi +##: if mkdir /usr/local/lib/${package_name}; then +##: chown root.staff /usr/local/lib/${package_name} || true +##: chmod 2775 /usr/local/lib/${package_name} || true +##: fi +##: fi + +if [ -e /etc/menu-methods/fvwm ] && [ ! -x /etc/menu-methods/fvwm ]; then + chmod a+x /etc/menu-methods/fvwm +fi + +# Ensure the menu system is updated +[ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus + + +## Deprecated +##if test -x /usr/sbin/wm-menu-config; then wm-menu-config fvwm on; fi + + +# Arrange for a daemon to be started at system boot time +##: update-rc.d ${package_name} default >/dev/null + + + +# This package uses debconf to ask a question, so source the debconf +# confmodule as early as possible. However, it does not depend on debconf, +# so debconf may not be installed. +##: if [ -e /usr/share/debconf/confmodule ]; then +##: . /usr/share/debconf/confmodule +##: db_capb +##: fi + + +case "$1" in + configure) + # Configure this package. If the package must prompt the user for + # information, do it here. + # Install emacs lisp files + ##:if [ -x /usr/lib/emacsen-common/emacs-package-install ]; then + ##: /usr/lib/emacsen-common/emacs-package-install $package_name + ##:fi + + + # Activate menu-methods script + chmod a+x /etc/menu-methods/${package_name} + + # Update ld.so cache + ##: ldconfig + + # Make our version of a program available + update-alternatives \ + --install /usr/bin/fvwm fvwm /usr/bin/fvwm2 200 \ + --slave /usr/share/man/man1/fvwm.1.gz fvwm.1.gz \ + /usr/share/man/man1/fvwm2.1.gz + update-alternatives \ + --install /usr/bin/x-window-manager x-window-manager /usr/bin/fvwm2 50 \ + --slave /usr/share/man/man1/x-window-manager.1.gz \ + x-window-manager.1.gz /usr/share/man/man1/fvwm2.1.gz + + # Tell ucf that the file in /usr/share/foo is the latest + # maintainer version, and let it handle how to manage the real + # confuguration file in /etc. This is how a static configuration + # file can be handled: + ##:if which ucf >/dev/null 2>&1; then + ##: ucf /usr/share/${package_name}/configuration /etc/${package_name}.conf + ##:fi + + ### We could also do this on the fly. The following is from Tore + ### Anderson: + + #. /usr/share/debconf/confmodule + + ### find out what the user answered. + # db_get foo/run_on_boot + # run_on_boot=$RET + # db_stop + + ### safely create a temporary file to generate our suggested + ### configuration file. + # tempfile=`tempfile` + # cat << _eof > $tempfile + ### Configuration file for Foo. + + ### this was answered by you, the user in a debconf dialogue + # RUNONBOOT=$run_on_boot + + ### this was not, as it has a sane default value. + # COLOUROFSKY=blue + + #_eof + + ### Note that some versions of debconf do not release stdin, so + ### the following invocation of ucf may not work, since the stdin + ### is never coneected to ucfr. + + ### now, invoke ucf, which will take care of the rest, and ask + ### the user if he wants to update his file, if it is modified. + #ucf $tempfile /etc/foo.conf + + ### done! now we'll just clear up our cruft. + #rm -f $tempfile + + + + # There are three sub-cases: + if test "${2+set}" != set; then + # We're being installed by an ancient dpkg which doesn't remember + # which version was most recently configured, or even whether + # there is a most recently configured version. + for i in system.fvwm2rc init-restart.hook; do + if [ -f /etc/X11/fvwm/$i ]; then + if [ ! -L /etc/X11/fvwm/$i ]; then + mv -f /etc/X11/fvwm/$i /etc/X11/fvwm/${i}.dpkg-old + fi + fi + done + + elif test -z "$2" || test "$2" = ""; then + # The package has not ever been configured on this system, or was + # purged since it was last configured. + : + + else + # Version $2 is the most recently configured version of this + # package. + if dpkg --compare-versions "$2" lt "2.5.8" ; then + for i in system.fvwm2rc init-restart.hook; do + if [ -f /etc/X11/fvwm/$i ]; then + if [ ! -L /etc/X11/fvwm/$i ]; then + mv -f /etc/X11/fvwm/$i /etc/X11/fvwm/${i}.dpkg-old + fi + fi + done + fi + fi + ;; + abort-upgrade) + # Back out of an attempt to upgrade this package FROM THIS VERSION + # to version $2. Undo the effects of "prerm upgrade $2". + ##: + + ;; + abort-remove) + if test "$2" != in-favour; then + echo "$0: undocumented call to \`postinst $*'" 1>&2 + exit 0 + fi + # Back out of an attempt to remove this package, which was due to + # a conflict with package $3 (version $4). Undo the effects of + # "prerm remove in-favour $3 $4". + ##: + + ;; + abort-deconfigure) + if test "$2" != in-favour || test "$5" != removing; then + echo "$0: undocumented call to \`postinst $*'" 1>&2 + exit 0 + fi + # Back out of an attempt to deconfigure this package, which was + # due to package $6 (version $7) which we depend on being removed + # to make way for package $3 (version $4). Undo the effects of + # "prerm deconfigure in-favour $3 $4 removing $6 $7". + ##: + + ;; + *) echo "$0: didn't understand being called with \`$1'" 1>&2 + exit 0;; +esac + +# Install doc base documentation +if which install-docs >/dev/null 2>&1; then + if [ -e /usr/share/doc-base/${package_name} ]; then + install-docs -i /usr/share/doc-base/${package_name} + fi +fi + +if [ -L /etc/alternatives/fvwm ]; then + BROKEN_FVWM_ALTERNATIVE=`readlink /etc/alternatives/fvwm` + if [ x$BROKEN_FVWM_ALTERNATIVE = x/usr/X11R6/bin/fvwm2 ]; then + update-alternatives --remove fvwm /usr/X11R6/bin/fvwm2 + update-alternatives --auto fvwm + elif [ x$BROKEN_FVWM_ALTERNATIVE = x/usr/bin/X11/fvwm2 ]; then + update-alternatives --remove fvwm /usr/bin/X11/fvwm2 + update-alternatives --auto fvwm + fi +fi + +if [ -L /etc/alternatives/x-window-manager ]; then + BROKEN_X_WM_ALTERNATIVE=`readlink /etc/alternatives/x-window-manager` + if [ x$BROKEN_X_WM_ALTERNATIVE = x/usr/X11R6/bin/fvwm2 ]; then + update-alternatives --remove x-window-manager /usr/X11R6/bin/fvwm2 + update-alternatives --auto x-window-manager + elif [ x$BROKEN_X_WM_ALTERNATIVE = x/usr/bin/X11/fvwm2 ]; then + update-alternatives --remove x-window-manager /usr/bin/X11/fvwm2 + update-alternatives --auto x-window-manager + fi +fi + + + +exit 0 --- fvwm-2.5.27.ds.orig/debian/prerm +++ fvwm-2.5.27.ds/debian/prerm @@ -0,0 +1,131 @@ +#! /bin/sh +# -*- Mode: Sh -*- +# prerm --- +# Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +# Created On : Fri Nov 14 12:16:39 2003 +# Created On Node : glaurung.green-gryphon.com +# Last Modified By : Manoj Srivastava +# Last Modified On : Fri Sep 21 02:38:50 2007 +# Last Machine Used: anzu.internal.golden-gryphon.com +# Update Count : 11 +# Status : Unknown, Use with caution! +# HISTORY : +# Description : +# +# arch-tag: a4c1a888-137d-4800-98f8-93d0365422d8 +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# + +# Abort if any command returns an error value +set -e + +package_name=fvwm + +if [ -z "$package_name" ]; then + print >&2 "Internal Error. Please report a bug." + exit 1; +fi + + +# This script is called as the first step in removing the package from +# the system. This includes cases where the user explicitly asked for +# the package to be removed, upgrade, automatic removal due to conflicts, +# and deconfiguration due to temporary removal of a depended-on package. + +# Info files should be uninstalled from the dir file in any case. +##: install-info --quiet --remove /usr/info/${package_name}.info + +case "$1" in + remove) + # This package about to be removed. + ##: + + # Remove package-specific directories from /usr/local. Don't try + # to remove standard directories such as /usr/local/lib. + ##: if test -d /usr/local/lib/${package_name}; then + ##: rmdir /usr/local/lib/${package_name} || true + ##: fi + + # Deactivate menu-methods script. + ##: chmod a-x /etc/menu-methods/${package_name} + + # Withdraw our version of a program. + update-alternatives --remove fvwm /usr/bin/fvwm2 + update-alternatives --remove x-window-manager /usr/bin/fvwm2 + + + # Get rid of the installed docs + if which install-docs >/dev/null 2>&1; then + install-docs -r $package_name || true + fi + + # Get rid of the byte compiled files + ##: if [ -x /usr/lib/emacsen-common/emacs-package-remove ]; then + ##: /usr/lib/emacsen-common/emacs-package-remove $package_name + ##: fi + + if [ -L /usr/doc/$package_name ]; then + rm -f /usr/doc/$package_name + fi + + # There are two sub-cases: + if test "${2+set}" = set; then + if test "$2" != in-favour; then + echo "$0: undocumented call to \`prerm $*'" 1>&2 + exit 0 + fi + # We are being removed because of a conflict with package $3 + # (version $4), which is now being installed. + : + + else + # The package is being removed in its own right. + : + + fi ;; + deconfigure) + if test "$2" != in-favour || test "$5" != removing; then + echo "$0: undocumented call to \`prerm $*'" 1>&2 + exit 0 + fi + # Package $6 (version $7) which we depend on is being removed due + # to a conflict with package $3 (version $4), and this package is + # being deconfigured until $6 can be reinstalled. + ##: + + ;; + upgrade) + # Prepare to upgrade FROM THIS VERSION of this package to version $2. + ##: + + if [ -L /usr/doc/$package_name ]; then + rm -f /usr/doc/$package_name + fi + + ;; + failed-upgrade) + # Prepare to upgrade from version $2 of this package TO THIS VERSION. + # This is only used if the old version's prerm couldn't handle it, + # and returned non-zero. (Fix old prerm bugs here.) + ##: + + ;; + *) echo "$0: didn't understand being called with \`$1'" 1>&2 + exit 0;; +esac + +exit 0 --- fvwm-2.5.27.ds.orig/debian/Fvwm.desktop +++ fvwm-2.5.27.ds/debian/Fvwm.desktop @@ -0,0 +1,15 @@ +## /etc/dm/Sessions/Fvwm.desktop ## + +[Desktop Entry] +Encoding=UTF-8 +Name=Fvwm +Comment=Fvwm +Exec=fvwm +Terminal=False +TryExec=fvwm +Type=Application + +[Window Manager] +SessionManaged=true + +## \ No newline at end of file --- fvwm-2.5.27.ds.orig/debian/menu-method +++ fvwm-2.5.27.ds/debian/menu-method @@ -0,0 +1,58 @@ +#!/usr/bin/install-menu +#I need menu-1.4! +# arch-tag: 73ccd6e4-fcf8-4b3f-8672-f61ae101cab5 + +compat="menu-1" + +!include menu.h +!include lang.h + +outputencoding="LOCALE" + +function start($var,$com)=\ + "+ \"" ifelse(ifneq(replace(title(), "$[gt.", "#"), title(), "GETTEXT"), \ + title(), \ + escfirst(esc(title(),"\\\""),$hotkey,"&")) \ + cond_surr(icon(),"%","%") "\" " $var " " $com "\n" + +supported + fvwmmodule= start("Module", $command) + fvwmother= start("", $command) + wm= start("Restart",$command) + x11fvwm2= start("Exec exec", $command) + x11fvwm= start("Exec exec", $command) + x11= start("Exec exec", $command) + text= start("Exec exec", term()) +endsupported + +# Usage: +# Read /etc/X11/fvwm/menudefs.hook +# Popup /Debian + +# Ok, "startmenu" is a little wacky, and comes in 4 parts: +# 1. If this is running for a user, then we do a DestroyMenu to clear +# out the system one. Furthermore, if we're dealing with the +# top-level /Debian menu, then add a title for it (normally done in +# system.fvwm2rc). Of course, none of this happens if we're +# running as root to produce the system-wide menudef.hook file. +# 2. We spit out an "AddToMenu /Foo/Bar/Baz" to start this menu. +# 3. We add a trailing newline to the lot. + +startmenu= "DestroyMenu \"" replacewith($section," ","_") "\"\n" \ + "AddToMenu \"" replacewith($section," ","_") "\" \"" \ + title() "\" Title Top\n" +endmenu= "\n" + +submenutitle= "+ \"" escfirst(title(),$hotkey,"&") \ + cond_surr(icon(),"%","%") "\" Popup \"" \ + replacewith($section," ","_") "\"\n" +genmenu= "menudefs.hook" +rootprefix="/etc/X11/fvwm/" + +#Technical note: For historical reason, userprefix treat path starting +#with 2 / as absolute and with 0 or one / as relative to $HOME. This +#is why I added a / before the $ +#userprefix="/.fvwm/" +userprefix=shell("echo -n /${FVWM_USERDIR-.fvwm}") +treewalk="c(m)" +mainmenutitle = "Debian Menu" --- fvwm-2.5.27.ds.orig/debian/rules +++ fvwm-2.5.27.ds/debian/rules @@ -0,0 +1,66 @@ +#! /usr/bin/make -f +############################ -*- Mode: Makefile; coding: utf-8 -*- ########################### +## rules --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Fri Nov 14 12:33:34 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Thu Apr 8 12:23:11 2004 +## Last Machine Used: glaurung.internal.golden-gryphon.com +## Update Count : 71 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : +## +## arch-tag: 9a5063f4-1e20-4fff-b22a-de94c1e3d954 +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## 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, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## +############################################################################### + +# Include dpkg-architecture generated variables +include debian/common/archvars.mk + +# Set variables with information extracted from control and changelog files +include debian/common/pkgvars.mk + +# variables useful for perl packages +include debian/common/perlvars.mk + +# we use debconf +include debian/common/debconf.mk + +# Install commands +include debian/common/install_cmds.mk + +include debian/local-vars.mk + +include debian/common/copt.mk + +include debian/common/automake.mk + + + +all: + @echo nothing to be done + +include debian/common/targets.mk + +include debian/local.mk + + +#Local variables: +#mode: makefile +#End: --- fvwm-2.5.27.ds.orig/debian/preinst +++ fvwm-2.5.27.ds/debian/preinst @@ -0,0 +1,102 @@ +#! /bin/sh +# -*- Mode: Sh -*- +# preinst --- +# Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +# Created On : Fri Nov 14 12:12:04 2003 +# Created On Node : glaurung.green-gryphon.com +# Last Modified By : Manoj Srivastava +# Last Modified On : Thu Apr 8 13:42:31 2004 +# Last Machine Used: glaurung.internal.golden-gryphon.com +# Update Count : 10 +# Status : Unknown, Use with caution! +# HISTORY : +# Description : +# +# arch-tag: d6a3672d-acb3-4f6c-9984-bad17d8ce0aa +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# + + +# Abort if any command returns an error value +set -e + +package_name=fvwm + +if [ -z "$package_name" ]; then + print >&2 "Internal Error. Please report a bug." + exit 1; +fi + + + +# This script is called before this version of this package is installed. +# When this script is called, the package's files have not been unpacked +# yet. + +# This package uses debconf to ask a question, so source the debconf +# confmodule as early as possible. However, it does not depend on debconf, +# so debconf may not be installed. +##: if [ -e /usr/share/debconf/confmodule ]; then +##: . /usr/share/debconf/confmodule +##: db_capb +##: fi + +case "$1" in + install) + # About to install this package. + ##: + + # Add a diversion. This is one of the few things which may be done + # before installing any files from the package. + ##: dpkg-divert --package foo --add --rename \ + ##: --divert /usr/bin/other.real /usr/bin/other + + # There are two sub-cases: + if test "${2+set}" = set; then + # The configuration files from version $2 of this package are + # still on the system. + : + + else + + # There is no existing configuration; install from scratch. + : + + fi ;; + upgrade) + # About to upgrade this package from version $2 TO THIS VERSION. + # "prerm upgrade" has already been called for the old version of + # this package. + ##: + if test $(echo $2 | sed -n 's/-.*//p') = "2.4.0"; then + if test -L /etc/X11/fvwm/system.fvwm2rc; then + rm -f /etc/X11/fvwm/system.fvwm2rc; + fi + fi + + ;; + abort-upgrade) + # Back out of an attempt to upgrade this package FROM THIS VERSION to + # version $2. Undo the effects of "postrm upgrade $2". + ##: + + ;; + *) echo "$0: didn't understand being called with \`$1'" 1>&2 + exit 0;; +esac + +exit 0 --- fvwm-2.5.27.ds.orig/debian/docentry-fvwm +++ fvwm-2.5.27.ds/debian/docentry-fvwm @@ -0,0 +1,18 @@ +Document: fvwm +Title: Fvwm Manual +Author: Various +Abstract: F(?) Virtual Window Manager is a powerful ICCCM2 compliant + multiple virtual desktop window manager the X Window System. FVWM + requires relatively little memory. It includes full support of the + EWMH (Extended Window Manager Hints) specification, + internationalization, improved window decoration code (no flickering + anymore), bi-directional asian text support, FreeType font support + (antialiasing), image rendering, Perl based module library, support + for PNG images, side titles and much more. +Section: Help + +Format: HTML +Index: /usr/share/doc/fvwm/html/index.html +Files: /usr/share/doc/fvwm/html/groupedCommands.html + /usr/share/doc/fvwm/html/allCommands.html + /usr/share/doc/fvwm/html/modules.html --- fvwm-2.5.27.ds.orig/debian/local.mk +++ fvwm-2.5.27.ds/debian/local.mk @@ -0,0 +1,167 @@ +############################ -*- Mode: Makefile -*- ########################### +## local.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Sat Nov 15 10:42:10 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Thu Feb 7 12:21:26 2008 +## Last Machine Used: anzu.internal.golden-gryphon.com +## Update Count : 64 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : +## +## arch-tag: b07b1015-30ba-4b46-915f-78c776a808f4 +## +############################################################################### + +testdir: + $(testdir) + +debian/stamp/pre-config-common: debian/stamp/conf/fvwm +debian/stamp/BUILD/fvwm: debian/stamp/build/fvwm +debian/stamp/INST/fvwm: debian/stamp/install/fvwm +debian/stamp/BIN/fvwm: debian/stamp/binary/fvwm + +CLN-common:: + $(REASON) + test ! -f Makefile || $(MAKE) distclean + +CLEAN/fvwm:: + test ! -d $(TMPTOP) || rm -rf $(TMPTOP) + test ! -d $(SRCTOP)/debian/build-$(package) || \ + rm -rf $(SRCTOP)/debian/build-$(package) + +debian/stamp/conf/autotools: + @test -d debian/stamp/conf || mkdir -p debian/stamp/conf + aclocal + autoheader + automake --add-missing + autoconf + @echo done > $@ + +debian/stamp/conf/fvwm: debian/stamp/conf/autotools + $(REASON) + @test -d debian/stamp/conf || mkdir -p debian/stamp/conf + for file in $(EXECUTABLE_SCRIPTS); do \ + if [ -e $$file ]; then \ + test -x $$file || chmod +x $$file; \ + fi; \ + done + mkdir -p $(SRCTOP)/debian/build-$(package) + (cd $(SRCTOP)/debian/build-$(package); \ + test ! -f config.cache || rm -f config.cache; \ + $(SRCTOP)/configure --verbose --prefix=$(PREFIX) $(confflags) \ + --sysconfdir=$(SYSCONFDIR) --libexecdir=$(LIBEXECDIR) \ + --mandir=$(MANTOP) --with-stroke-library \ + --disable-gtktest --disable-imlibtest \ + --without-gnome --disable-gtk \ + --with-gtk-prefix=/no/dir --with-imlib-prefix=/no/dir\ + --enable-htmldoc --htmldir=$(HTMLDIR)) + @echo done > $@ + +debian/stamp/build/fvwm: + $(REASON) + $(CHECKPO) + @test -d debian/stamp/build || mkdir -p debian/stamp/build + bash -n debian/preinst + bash -n debian/prerm + bash -n debian/postinst + bash -n debian/postrm + (cd $(SRCTOP)/debian/build-$(package); $(MAKE)) + @echo done > $@ + +debian/stamp/install/fvwm: + $(REASON) + $(TESTROOT) + rm -rf $(TMPTOP) $(TMPTOP).deb + $(make_directory) $(DOCDIR)/sample.fvwmrc/manoj + $(make_directory) $(DOCDIR)/docs + $(make_directory) $(DOCDIR)/html + $(make_directory) $(LIBDIR) + $(make_directory) $(METHODSDIR) + $(make_directory) $(METHODSLOC) + $(make_directory) $(DOCBASEDIR) + $(make_directory) $(MENUDIR) + $(make_directory) $(DM_DIR) + (cd $(SRCTOP)/debian/build-$(package); $(MAKE) DESTDIR=$(TMPTOP) install) + mv $(TMPTOP)/$(PREFIX)/bin/fvwm $(TMPTOP)/$(PREFIX)/bin/fvwm2 + mv $(MAN1DIR)/fvwm.1 $(MAN1DIR)/fvwm2.1 + rm -f $(MAN1DIR)/xpmroot.1 + gzip -9fqr $(MAN1DIR) + ln -s fvwm-root.1.gz $(MAN1DIR)/xpmroot.1.gz + $(install_file) sample.fvwmrc/* $(DOCDIR)/sample.fvwmrc/ + $(install_file) debian/manoj/* $(DOCDIR)/sample.fvwmrc/manoj/ + $(install_file) debian/manoj/.fvwm2rc \ + $(DOCDIR)/sample.fvwmrc/manoj/ + $(install_file) debian/manoj/.FvwmAnimate \ + $(DOCDIR)/sample.fvwmrc/manoj/ + rm $(DOCDIR)/sample.fvwmrc/Makefile* + $(install_file) debian/Fvwm.desktop $(DM_DIR) + $(install_file) docs/* $(DOCDIR)/docs/ + $(install_file) AUTHORS $(DOCDIR)/ + $(install_file) NEWS $(DOCDIR)/ + $(install_file) README $(DOCDIR)/ + $(install_file) ChangeLog $(DOCDIR)/changelog + $(install_file) debian/changelog $(DOCDIR)/changelog.Debian + $(install_file) debian/NEWS.Debian $(DOCDIR)/ + test ! -f $(DOCTOP)/fvwm/index.html || \ + mv $(DOCTOP)/fvwm/*.html $(DOCDIR)/html + test ! -f doc/footer.html || \ + mv doc/footer.html $(DOCDIR)/html + test ! -d $(DOCTOP)/fvwm/fvwm || \ + mv $(DOCTOP)/fvwm/fvwm $(DOCDIR)/html/ + test ! -d $(DOCTOP)/fvwm/images || \ + mv $(DOCTOP)/fvwm/images $(DOCDIR)/html/ + gzip -9fqr $(DOCDIR) + gunzip -fqr $(DOCDIR)/html + ln -s docs/ANNOUNCE.gz $(DOCDIR)/ANNOUNCE.gz + $(install_file) debian/copyright $(DOCDIR)/ + $(install_file) debian/menuentry-$(package) \ + $(MENUDIR)/$(package) + $(install_program) debian/menu-method $(METHODSDIR)/fvwm + -rm -rf $(DOCTOP)/fvwm/commands $(DOCTOP)/fvwm/fvwm \ + $(DOCTOP)/fvwm/modules $(DOCTOP)/fvwm/images + -rmdir $(DOCTOP)/fvwm + $(install_file) debian/docentry-$(package) $(DOCBASEDIR)/$(package) +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + find $(TMPTOP) -type f | while read i; do \ + if file -b $$i | egrep -q "^ELF.*executable"; then \ + strip --strip-all --remove-section=.comment --remove-section=.note $$i; \ + fi; \ + done + find $(TMPTOP) -type f | while read i; do \ + if file -b $$i | egrep -q "^ELF.*shared object"; then \ + strip --strip-unneeded --remove-section=.comment --remove-section=.note $$i; \ + fi; \ + done +endif + @test -d debian/stamp/install || mkdir -p debian/stamp/install + @echo done > $@ + + +debian/stamp/binary/fvwm: + $(REASON) + $(checkdir) + $(TESTROOT) + $(make_directory) $(TMPTOP)/DEBIAN + $(install_file) debian/conffiles $(TMPTOP)/DEBIAN/conffiles + $(install_program) debian/postinst $(TMPTOP)/DEBIAN/postinst + $(install_program) debian/preinst $(TMPTOP)/DEBIAN/preinst + $(install_program) debian/prerm $(TMPTOP)/DEBIAN/prerm + $(install_program) debian/postrm $(TMPTOP)/DEBIAN/postrm + k=`find $(TMPTOP) -type f | ( while read i; do \ + if file -b $$i | egrep -q "^ELF.*executable.*dynamically linked"; then \ + j="$$j $$i"; \ + fi; \ + done; echo $$j; )`; dpkg-shlibdeps $(TMPTOP)/$(PREFIX)/bin/fvwm2 $$k + dpkg-gencontrol -p$(package) -isp -P$(TMPTOP) + $(create_md5sum) $(TMPTOP) + chown -R root:root $(TMPTOP) + chmod -R u+w,go=rX $(TMPTOP) + dpkg --build $(TMPTOP) .. + @test -d debian/stamp/binary || mkdir -p debian/stamp/binary + @echo done > $@ + + + --- fvwm-2.5.27.ds.orig/debian/menuentry-fvwm +++ fvwm-2.5.27.ds/debian/menuentry-fvwm @@ -0,0 +1,237 @@ +?package(fvwm):\ + needs="wm"\ + section="Window Managers"\ + title="FVWM"\ + longtitle="FVWM Windows Manager"\ + command="/usr/bin/fvwm2" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmAnimate"\ + longtitle="FvwmAnimate: animate iconification and deiconification"\ + command="FvwmAnimate" + +?package(fvwm):\ + needs="fvwmother"\ + section="FVWM Modules"\ + title="FvwmAnimate menu"\ + longtitle="Configuration menu for FvwmAnimate (after FvwmAnimate started)"\ + command="Popup MenuFvwmAnimate" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmAuto"\ + longtitle="FvwmAuto: autoraise windows with keyboard input focus"\ + command="FvwmAuto 300 raise lower" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmBacker"\ + longtitle="FvwmBacker: change the background when changing desktops"\ + command="FvwmBacker" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmBanner"\ + longtitle="FvwmBanner: display the FVWM logo for 3 seconds"\ + command="FvwmBanner" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmButtons"\ + longtitle="FvwmButtons: display a command button panel"\ + command="FvwmButtons" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmButtons (Debian)"\ + longtitle="FvwmButtons (Debian version): display a command button panel"\ + command="FvwmButtons DebianFvwmButtons" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmCommandS"\ + longtitle="FvwmCommandS: initialise FvwmCommand handling"\ + command="FvwmCommandS" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmConsole"\ + longtitle="FvwmConsole: a way to type commands for FVWM to execute"\ + command="FvwmConsole" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmCpp"\ + longtitle="FvwmCpp: cpp"\ + command="FvwmCpp" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmDebug"\ + longtitle="FvwmDebug: debug"\ + command="FvwmDebug" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmDragWell"\ + longtitle="FvwmDragWell: drag"\ + command="FvwmDragWell" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmEvent"\ + longtitle="FvwmEvent: binds actions to events, such as audio actions"\ + command="FvwmEvent" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmForm"\ + longtitle="FvwmForm: Form"\ + command="FvwmForm" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmGtk"\ + longtitle="FvwmGtk: create menus and dialogs using GTK+ toolkit"\ + command="FvwmGtk" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmIconBox"\ + longtitle="FvwmIconBox: an icon manager"\ + command="FvwmIconBox" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmIconMan"\ + longtitle="FvwmIconMan: another icon manager"\ + command="FvwmIconMan" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmIdent"\ + longtitle="FvwmIdent: show info about a selected window"\ + command="FvwmIdent" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmM4"\ + longtitle="FvwmM4: m4"\ + command="FvwmM4" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmPager"\ + longtitle="FvwmPager: virtual desktop manager"\ + command="FvwmPager 0 0" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmRearrange (vert)"\ + longtitle="FvwmRearrange: rearrange windows on screen in a vertical fashion"\ + command="FvwmRearrange -tile" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmRearrange (horiz)"\ + longtitle="FvwmRearrange: rearrange windows on screen in a horizontal fashion"\ + command="FvwmRearrange -tile -h" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmRearrange (cascade)"\ + longtitle="FvwmRearrange: rearrange windows on screen in a cascading fashion"\ + command="FvwmRearrange -cascade" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmSave"\ + longtitle="FvwmSave: save desktop layout to new.xinitrc (pseudo-.xinitrc)"\ + command="FvwmSave" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmSaveDesk"\ + longtitle="FvwmSaveDesk: save desktop layout to .fvwm2desk file"\ + command="FvwmSaveDesk" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmScript"\ + longtitle="FvwmScript: script"\ + command="FvwmScript" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmScroll"\ + longtitle="FvwmScroll: add scroll bars to selected window"\ + command="FvwmScroll" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmTalk"\ + longtitle="FvwmTalk: type commands into a window for FVWM to execute"\ + command="FvwmTalk" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmTaskBar"\ + longtitle="FvwmTaskBar: show a Windows 95/98 type task bar"\ + command="FvwmTaskBar" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmTheme"\ + longtitle="FvwmTheme: theme"\ + command="FvwmTheme" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmTile"\ + longtitle="FvwmTile: tile"\ + command="FvwmTile" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmWharf"\ + longtitle="FvwmWharf: free-floating application loader and executer"\ + command="FvwmWharf" + +?package(fvwm):\ + needs="fvwmmodule"\ + section="FVWM Modules"\ + title="FvwmWinList"\ + longtitle="FvwmWinList: show a window list for quick navigation"\ + command="FvwmWinList" --- fvwm-2.5.27.ds.orig/debian/copyright +++ fvwm-2.5.27.ds/debian/copyright @@ -0,0 +1,115 @@ +This package was debianized by Alexander Kotelnikov on +Thu, 14 Dec 2000 14:30:25 +0300. + +It was downloaded from + +Upstream Authors: read AUTHORS file + +License: GPL version 2 (see /usr/share/common-licenses/GPL-2) and +additional copyrights of the fvwm main module: + + Portions of fvwm are: + Copyright (C) 1988 by Evans and Sutherland Computer Corporation, Salt + Lake City, Utah, + Copyright (C) 1989 by the Massachusetts Institute of Technology, + Cambridge, Massachusetts, All rights reserved. + Copyright (C) 1992 Alan Richardson (mppa3@uk.ac.sussex.syma) + Copyright (C) 1993, 1994 by Robert Nation. + Copyright (C) 1994 Mark Boyns + Copyright (C) 1994 Mark Scott + Copyright (C) 1994 Mike Finger + Copyright (C) 1994 Nobutaka Suzuki + Copyright (C) 1995 Bo Yang + Copyright (C) 1995 Carsten Paeth + Copyright (C) 1995 Pekka Pietik{inen (pp@netppl.fi) + Copyright (C) 1995 Thomas Zuwei Feng + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. + Copyright (C) 1996 Alfredo Kengi Kojima (kojima@inf.ufrgs.br) + Copyright (C) 1996 Alfredo Kojima + Copyright (C) 1996 Beat Christen. + Copyright (C) 1996 Caesar Crusius + Copyright (C) 1996 Frederic Cordier + Copyright (C) 1996 Jarl Totland + Copyright (C) 1996 Kaj Groner + Copyright (C) 1997 Frank Scheelen + Copyright (C) 1998 Albrecht Kadlec + Copyright (C) 1998 Dan Espen + Copyright (C) 1998 Toshi Isogai + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2002, 2003, 2004 Mikhael Goikhman + Copyright (C) 1999 Fabien Villard + Copyright (C) 1999 Matthias Clasen + Copyright (C) 1999 Sir Boris. sir_boris@bigfoot.com + Copyright (C) 1999, 2001, 2003 Dominik Vogt + Copyright (C) 1999, 2002 Joey Shutup. + Copyright (C) 2001 Dmitry Bolkhovityanov + Copyright (C) 2001, 2002, 2003, 2004 Olivier Chapuis + Copyright (C) 2002 Jason Weber + Copyright (C) 2002 Nadim Shaikli (arabeyes.org) + Copyright (C) 2002, 2003, 2004, 2005, 2006 Scott Smedley ss@aao.gov.au + Copyright (C) 2003 Marcus Lundblad + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the names of Evans & Sutherland and +M.I.T. not be used in advertising in publicity pertaining to +distribution of the software without specific, written prior +permission. + +ROBERT NATION, CHARLES HINES, EVANS & SUTHERLAND, AND M.I.T. DISCLAIM +ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL EVANS & +SUTHERLAND OR M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Portions of the DocBook documentation are: + Copyright 1992-2004 HaL Computer Systems, Inc., + O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software + Corporation, Norman Walsh, Sun Microsystems, Inc., and the + Organization for the Advancement of Structured Information + Standards (OASIS). + Permission to use, copy, modify and distribute the DocBook DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + Please direct all questions, bug reports, or suggestions for + changes to the docbook@lists.oasis-open.org mailing list. For more + information, see http://www.oasis-open.org/docbook/. + + + +For the Debian distribution, the upstream sources were repacked to +remove the ./debian directory provided by the upstream authors, since +it conflicts with the Debian packaging used for official Debian +packages. Apart from removing the ./debian directory no chnages were +made to upstream sources. + +The Debian specific changes are © 2004, 2005, 2006, 2007 Manoj +Srivastava , and distributed under the terms of +the GNU General Public License, version 2, or any later version, at +your convenience. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + A copy of the GNU General Public License is also available at + . You may also obtain + it by writing to the Free Software Foundation, Inc., 51 Franklin + St, Fifth Floor, Boston, MA 02110-1301 USA + +Manoj Srivastava +arch-tag: d4250e44-a0e0-4ee0-adb9-2bd74f6eeb27 --- fvwm-2.5.27.ds.orig/debian/local-vars.mk +++ fvwm-2.5.27.ds/debian/local-vars.mk @@ -0,0 +1,65 @@ +############################ -*- Mode: Makefile -*- ########################### +## local-vars.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Sat Nov 15 10:43:00 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Fri Sep 21 00:33:23 2007 +## Last Machine Used: anzu.internal.golden-gryphon.com +## Update Count : 16 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : +## +## arch-tag: 1a76a87e-7af5-424a-a30d-61660c8f243e +## +############################################################################### + +FILES_TO_CLEAN = debian/files debian/substvarsdebian/ChangeLog debian/control.in \ + debian/dirs debian/docs debian/fvwm.menu debian/fvwm.menu-method \ + debian/Makefile.am debian/Makefile.in +STAMPS_TO_CLEAN = +DIRS_TO_CLEAN = $(TMPTOP) autom4te.cache $(SRCTOP)/debian/build-$(package) debian/stamp +EXECUTABLE_SCRIPTS = $(SRCTOP)/config.guess $(SRCTOP)/config.sub $(SRCTOP)/configure \ + $(SRCTOP)/depcomp $(SRCTOP)/install-sh $(SRCTOP)/missing \ + $(SRCTOP)/mkinstalldirs + +# Location of the source dir +SRCTOP := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) +TMPTOP = $(SRCTOP)/debian/$(package) + +LINTIANDIR = $(TMPTOP)/usr/share/lintian/overrides +MENUDIR = $(TMPTOP)/usr/share/menu +DOCBASEDIR = $(TMPTOP)/usr/share/doc-base + +PREFIX = /usr +SYSCONFDIR = /etc/X11/fvwm +LIBEXECDIR = $(PREFIX)/lib +MANTOP = $(PREFIX)/share/man + +MAN1DIR = $(TMPTOP)/$(MANTOP)/man1 +MAN3DIR = $(TMPTOP)/$(MANTOP)/man3 +MAN5DIR = $(TMPTOP)/$(MANTOP)/man5 +MAN7DIR = $(TMPTOP)/$(MANTOP)/man7 +MAN8DIR = $(TMPTOP)/$(MANTOP)/man8 +INFODIR = $(TMPTOP)/usr/share/info +DOCTOP = $(TMPTOP)/usr/share/doc +DOCDIR = $(DOCTOP)/$(package) +HTMLDIR = $(DOCDIR)/html +LIBDIR = $(TMPTOP)$(SYSCONFDIR) +#DM_DIR = $(TMPTOP)/etc/dm/Sessions/ +DM_DIR = $(TMPTOP)/usr/share/xsessions/ + +METHODSDIR = $(TMPTOP)/etc/menu-methods +METHODSLOC = $(TMPTOP)/etc/X11/fvwm + +FILES_TO_NUKE= + +define checkdir + @test -f debian/rules -a -f fvwm/fvwm.h || \ + (echo Not in correct source directory; exit 1) +endef + +define checkroot + @test $$(id -u) = 0 || (echo need root priviledges; exit 1) +endef --- fvwm-2.5.27.ds.orig/debian/control +++ fvwm-2.5.27.ds/debian/control @@ -0,0 +1,36 @@ +Source: fvwm +VCS-Git: git://git.debian.org/~srivasta/debian/fvwm.git +VCS-Browser: http://git.debian.org/?p=users/srivasta/debian/fvwm.git +Section: x11 +Priority: optional +Maintainer: Manoj Srivastava +Uploaders: Alexander Kotelnikov , Manoj Srivastava +Build-Depends: autotools-dev, libncurses5-dev, libreadline5-dev | libreadline-dev, + libpng12-dev | libpng-dev, libstroke0-dev, libfribidi-dev (>= 0.10.7), + libxft-dev, libfreetype6-dev, librsvg2-dev (>= 2.13.92), libxcursor-dev, + libxinerama-dev, librplay3-dev, file, xsltproc, + libxrandr-dev, libxrender-dev, libice-dev, libsm-dev, + libx11-dev, libxext-dev, libxpm-dev, libxt-dev, libxi-dev, + fontconfig, libfontconfig1-dev | libfontconfig-dev, autoconf, + automake, po-debconf, gettext +Homepage: http://www.fvwm.org/ +Standards-Version: 3.8.0.0 + +Package: fvwm +Architecture: any +Depends: ${shlibs:Depends} +Recommends: fvwm-icons +Suggests: fvwm-themes, m4, cpp, menu (>=1.5), wm-icons, perl-tk, libx11-protocol-perl +Provides: x-window-manager, fvwm-gnome +Conflicts: fvwm-beta, fvwm-common, fvwmtabs, fvwm-gnome +Replaces: fvwm-beta, fvwm-common, fvwmtabss, fvwm-gnome +Description: F(?) Virtual Window Manager + FVWM is a powerful ICCCM2 compliant multiple virtual desktop window manager + for the X Window System. FVWM requires relatively little memory. + . + This 2.5 version includes new features like full support of the EWMH + (Extended Window Manager Hints) specification, internationalization, + improved window decoration code (no flickering anymore), + bi-directional asian text support, FreeType font support + (antialiasing), image rendering, Perl based module library, support + for PNG images, side titles and much more. --- fvwm-2.5.27.ds.orig/debian/substvars +++ fvwm-2.5.27.ds/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3), libcairo2 (>= 1.2.4), libfontconfig1 (>= 2.4.0), libfreetype6 (>= 2.3.5), libfribidi0 (>= 0.10.9), libglib2.0-0 (>= 2.12.0), libgtk2.0-0 (>= 2.12.0), libice6 (>= 1:1.0.0), libncurses5 (>= 5.6+20071006-3), libpng12-0 (>= 1.2.13-4), libreadline5 (>= 5.2), librplay3 (>= 3.3.2-2), librsvg2-2 (>= 2.18.1), libsm6, libstroke0 (>= 0.5.1), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxft2 (>> 2.1.1), libxinerama1, libxpm4, libxrender1, zlib1g (>= 1:1.1.4) --- fvwm-2.5.27.ds.orig/debian/changelog +++ fvwm-2.5.27.ds/debian/changelog @@ -0,0 +1,1663 @@ +fvwm (1:2.5.27.ds-1) unstable; urgency=low + + * New upstream release + - New extended variable + $[w.visiblename] + - Style matching now honours the window's visible name which + means it can be matched before the real name, hence: + Style $[w.visiblename] Colorset 5 + is now honoured. Useful with IndexedWindowName as a style + option. + - New style InitialMapCommand allows to execute any command + when a window is mapped first. + - New option to PrintInfo, "bindings" which prints out all of + the Key, PointerKey, Mouse and Stroke bindings which fvwm + knows about. + - Fixed compilation without XRender support. + - Fixed handling of _NET_MOVERESIZE_WINDOWS requests. + - Fixed a bug in automatic detection mode of the style + MoveByProgramMethod. + - Fixed png detection when cross compiling. + - Fixed keeping fullscreen window mode over a restart. + - The style PositionPlacement now honours StartsOnPage. + - Reset signal handlers for executed modules and programs. + - Try to handle a bug an old version of the EWMH spec by + honouring both, the _NET_WM_STATE_MAXIMIZED_HORIZ hint and + the _NET_WM_STATE_MAXIMIZED_HORZ hitn. + - Fix the GNOME location prefix to application .desktop files. + - 'PositionPlacement UnderMouse' now forces the window + on-screen, just like the old UnderMousePlacement style option + used to. + * [ba7521b]: Merge branch 'topic--emulator' + [acfff93]: Merge branch 'topic--debian' + [5944880]: Merge branch 'upstream' into topic--debian + [29a3be6]: Merge branch 'upstream' into topic--emulator + [ad3be09]: Delete upstream debian directory. + [822ca74]: Merge branch 'upstream' into topic--debian + [172c11e]: Merge branch 'upstream' into topic--emulator + [e820738]: Imported fvwm_2.5.27.orig.tar.gz + + -- Manoj Srivastava Wed, 25 Feb 2009 02:05:13 -0600 + +fvwm (1:2.5.26-2) unstable; urgency=low + + * [debiandir:250b152]: Update the standards version, as well as the VCS + browser field + * [debiandir:e2d7ea6]: Remove the gtk build dependencies, and do not + look for gtk The menus used in Fvwm can either be native, or, using + FvwmGTK, be GTK-based alternatives. FvwmGtk only has options to define + the content of the menus and dialogs. The builtin menus offer many + features which the GTK menus currently don’t have. None of the + features of the builtin window-list have been implemented. FvwmGtk + module requires GTK+ and optionally GDK-Imlib and GNOME libraries. + GDK-Imlib library that is a part of Imlib version 1 is used to have + images. Most of thee libraries are not obsolete, and development of + FvwmGtk module does not seem to be keeping up. Note, fvwm itself has + an ability to support GNOME Window Manager hints (which is enabled by + default), this has nothing to do with GNOME library support compiled + into FvwmGtk (which is autoprobed and used if passed). In this commit, + we disable autoprobing of GTK+, Imlib and GNOME libraries. This is a + imperceptible change in functionality. + + -- Manoj Srivastava Sun, 21 Dec 2008 11:38:00 -0600 + +fvwm (1:2.5.26-1) unstable; urgency=low + + * New upstream release. + New features: + - New MenuStyle option VerticalMargins. + New module features: + - FvwmButtons: New button alignment option: top. + Bug fixes: + - Fixed crash in ARGB visual detection code. + - Fixed compilation without XRender support. + - Fixed drawing of background pictures in menu items and titles. + - Fixed hadling of shaped windows. + - Fixed a 64-bit bug in the EWMH code. + * Moved to the new streamlined build mechanism + * Removed the fvwm-gnome package + * Record the fact that this package has moved to a git repository. + + -- Manoj Srivastava Thu, 29 May 2008 12:05:28 -0500 + +fvwm (1:2.5.25-1) unstable; urgency=low + + * New upstream release. Closes: #438132 + - Handle the STATE_ADD command of the EWMH _NET_WM_STATE + message from version 1.3 of the EWMH spec. + - Support transparency in ARGB windows + * Bug fixes: + - Fixed problem with windows disappearing when created + unless the style Unmanaged was used. Closes: #443573 + - Edge move delay was used as resistance for the top edge. Closes: #465454 + - Fixed a parsing problem of the screen argument of the + SnapAttraction style. + - Some html documentation files were not installed. + - Fixed a memory leak in internationalized font handling. + - Fixed a bug in MinOverlap placement. Closes: #458163 + - Fixed the StickyAcrossPages style in the FvwmPager. + - Fixed the determination of the X charset on UTF-8 systems. + - Fixed a crash when certain EWMH messages were sent to + unmanaged windows. + - Fixed a memory leak in multibyte codepage code. + - Ignore the EWMH staysontop and staysonbottom hints if the + EWMHIgnoreStackingOrderHints style is used. + - Fixed a sporadic crash when the root background set by gnome, + fvwm-root, esetroot etc. changes and a root transparent + colour set is used. + - Fixed spradic crash in modules with root transparent + background from colour sets. + - Fixed a possible crash if the last active module fails. + * Bug fix: "fvwm: should not conflict against fvwm-gnome", thanks to + Philipp Kern. Yes, there should have been a versioned conflicts, I + think. Closes: #470149 + * Bug fix: "Transition from fvwm-gnome does not work smoothly", thanks + to Heikki Kantola. This is the same bug as the one above. Closes: #468464 + + + -- Manoj Srivastava Tue, 18 Mar 2008 23:29:12 -0500 + +fvwm (1:2.5.24-1) unstable; urgency=low + + * New upstream release + - Disabled paging during interactive resize operations by + default (see 2.5.20) as it is annoying to many people. + - New style command options: + EdgeMoveResistance + EdgeMoveDelay + EdgeResizeDelay + SnapGrid + SnapAttraction + that replace the now obsolete commands EdgeResistance, + SnapGrid and SnapAttraction. The EdgeResistance command has + a new syntax with only one argument. + - New command MenuCloseAndExec for menu bindinngs that can be + used to trigger certain commands from a menu without an + associated item. For example, with + Key F1 MTI[]-_ A MenuCloseAndExec Menu RootMenu + the RootMenu can be opened from any other menu by pressing + F1. + * Bug fixes: + - Sometimes a window jumped by half the screen's size when + moving with the mouse and hitting the border of the desktop. + - Fixed the "screen w" argument of the Move and other commands. + - Clicking on a menu title did not close the menu by default. + - Temporary files in FvwmPerl overwrote each other. + * The segmentation fault in ewmh_events has been fixed in this + version. Closes: Bug#463384 + * Change the dependency to gnome1 libraries; Closes: Bug#460761 + This also means that there was no point in having a separate fvwm + package where FvwmGtk was a gnome entity; since it was never ported to + gnome2. So, fvwm-gnome is now a dummy package; and is meant to + transition to plain old fvwm. + * Removed the debconf question; since the upgrade would be directly from + a system installed in 2003 for the question to be valid. + * Move _all the html files into the documentation directory, thanks to + Christer Andersson. Closes: Bug#455473 + + -- Manoj Srivastava Thu, 07 Feb 2008 09:57:14 -0600 + +fvwm (1:2.5.23-2) unstable; urgency=low + + * + * Bug fix: "fvwm: postinst fails", thanks to Mario 'BitKoenig' + Holbe. Added a Section field to doc-base file. Funny thing is, this + did not fail to install for me -- I wonder why. (Closes: #443511). + * Bug fix: "fvwm: unnecessary ~/.fvwm/ creation", thanks to Neil W. Van + Dyke. Turns out that this latest version does not create a .fvwm/ + directory. (Closes: #193761). + + -- Manoj Srivastava Fri, 21 Sep 2007 20:37:58 -0500 + +fvwm (1:2.5.23-1) unstable; urgency=low + + * New upstream release. Bug fix: "fvwm: Please update to current + upstream version!", thanks to Sven Geggus (Closes: #441789). + * New features: + - New Style command options: + StartShaded + UnderMousePlacementHonorsStartsOnPage + UnderMousePlacementIgnoresStartsOnPage + !MinOverlapPlacementPenalties + !MinOverlapPercentPlacementPenalties + MinWindowSize + - SVG (scalable vector graphics) image loading support. + - New extended variables + $[w.iconfile.svgopts] + $[w.miniiconfile.svgopts]. + - Added suffix 'w' to the arguments of the Move command and + similar. It is now possible to add multiple shifts to a + window position, e.g. "50-50w 50-50w" for the center of the + screen. + - Removed UnderMousePlacement and CenterPlacement. Use + "PositionPlacement Center" and "PositionPlacement UnderMouse" + instead. + - Documentation in HTML format. + - Replaced "UseListSkip" with "UseSkipList" & "OnlyListSkip" with + "OnlySkipList" in WindowList command. (Old options deprecated.) + - New subject ImageCache for PrintInfo command. + - The new commad EchoFuncDefinition prints a function's + definition to the console for debugging purposes. + - The CursorStyle command can now load PNG and SVG images as + mouse cursors. New x and y arguments to specify the + hot spot. Also, it is now possible to load non-monochrome + cursors and cursors with partial transparency. + * New module features: + - FvwmScript: New instructions: ChangeWindowTitle and + ChangeWindowTitleFromArg. + * Bug Fixes: + - Fixed FvwmButton's button placement algorithm broken in + 2.5.22. + - Windows with aspect ratio no longer maximize past the screen + edges. + - Fixed CenterPlacement with Xinerama screens. + - Fixed CascadePlacement with title direction west and east + - Windows no longer unstick when going to fullscreen mode. + - Fixed crash when raising/lowering a destroyed window. + - Fixed expansion of $[n-] and $[*], broken in 2.5.20. + - Fixes for resizing shaded windows and windows with a gravity + other than northwest. + - Fixed CursorStyle POSITION, broken since 2.3.24. + - The hi, sh and fgsh colors in colorsets are no longer replaced + by computed values if not explicit set on the same line as the + bg, or for fgsh fg, changes. (bug #3359) + - FvwmButtons now redraws stretched button backgrounds correctly + on partial expose. + - Windows with circular transient for hints may no longer crash + fvwm with StackTransientParent style. + - FvwmPager now displays windows that are StickyAcrossPages + correctly. + - Fixed a possible crash with modules closing down. + - Fixed broken demo script fvwm_make_browse_menu.sh. + - The conditon following a comma separator without whitespace + padding was previously ignored if the presiding condition was + multi-worded. + - Various FvwmButtons drawing problems. + - Window movement or resizing triggered by an EWMH message now + honours the FixedSize and FixedPosition window styles. + - Properly generate leave_window and enter_window events for + the root window in FvwmEvent. + - Fixed crash in UTF8 code. + - Fixed parsing of the PropertyChange command. + - Fixed windowlist crash when combining CurrentAtEnd with + IconifiedAtEnd and all windows are iconified. + * Bug fix: "fvwm: debia/copyright: update download URL location", thanks + to Jari Aalto. Also updated copyrights for this release. (Closes: #438439). + + -- Manoj Srivastava Thu, 20 Sep 2007 17:35:51 -0500 + +fvwm (1:2.5.21-1) unstable; urgency=low + + * New upstream release. + * New features: + - The command Scroll can now be used for interactive scrolling. + - New Style options: StippledIconTitle, !StickyStippledTitle, + and !StickyStippledIconTitle. + - Full support for menu context (M) key and mouse bindings. See + the section Menu Bindings in the man page for details. + - Hilighted menu backgrounds now use pixmaps gradients and + transparency from their related colorset. + - New window conditions: StickyIcon, StickyAcrossPagesIcon and + StickyAcrossDesksIcon. + * Changed features: + - "Mouse n M N" is no longer used to disable or remap the + builtin tear off menu button. See the section Tear Off Menus + for details on replacement commands. + * Bug Fixes: + - Fixed Tile...Placement styles (SmartPlacement) that were + broken in 2.5.20. + - FvwmWinList: fix problem with window name/button mixups during + Init/Restart of fvwm. (bug #1393) + - It is now possible to switch the viewport while resizing + windows if "EdgeScroll 0 0" is set. + - Fixed disappearing windows when aborting interactive resizing + of maximized windows when unmaximizing them later. + - Fixed disappearing windows when moving maximized windows and + unmaximizing them later. + - Fixed calculation of final location with MoveToPage and + MoveToScreen with windows to the left or top of the viewport. + - 64-bit architecture fix in FvwmProxy. + - FvwmForm now work with balanced quoted command for Timeout. + - FvwmPager correctly updates on window desk change. + - FvwmIconBox: fixed problem with IconColorset's background + color change not being applied immediately. + - Allow FvwmConsole to run a terminal via rxvtc or urxvtc. + FvwmConsole dies if no client connects within one minute. + - Expansion of variables in FvwmTaskBar launch button commands + fixed. + - Fixed a race condition with applications raising their own + transient windows in certain ways. (Apple Shake, kphotoalbum) + - FvwmIdent reports the correct geometry if the window has its + title at the left or right side. + - Fixed an infinite loop when deiconifying windows in a group + via a different window than the initially iconified. + - FvwmCommand now reports "end windowlist" and "end configinfo". + - FvwmCommand now prints config info split on lines. + - FvwmTaskBar no longer gets lost with trailing whitespace after + geometry specification. + - Fixed a window size problem if the aspect ratio is set (e.g. + mplayer). + - Decorations now update when unmanaged windows take focus, and + not FlickeringQtDialogsWorkaround is enabled. + - FvwmPager again allows movement of windows added before a + page change. + - fvwm no longer crashes on 1 and 4 bit displays. (#1677) + - EWMH desktops now correctly handles FPClickToFocus. (#1492) + - Security fix in fvwm-menu-directory. (CVE-2006-5969) + * Bug fix: "fvwm crashes on 1-bpp and 4-bpp displays", thanks to Andre + Majorel. Fixed upstream. (Closes: #287588). + * Bug fix: "When starting fvwm, FvwmWinList contains random windows", + thanks to Vincent Lefevre. Fixed upstream. (Closes: #263945). + * Bug fix: "moving with middle mouse button in fvwm pager does not + work", thanks to Sebastian Miele. I can no longer reproduce this with + the new upstream, so I think this has been fixed. (Closes: #402525). + * Bug fix: "fvwm: does not display fr_FR.UTF-8 properly and other", + thanks to Bill Allombert. This too seems to work -- I added an menu + entry called "More Gämes", and with UTF-8 titles, and that works. The + font used is critical -- I use ``MenuStyle * Font + "Shadow=2:xft:Sans:Bold:size=11:antialias=True"'' which shows up + fine. (Closes: #392812). + * Bug fix: "fvwm: causes spurious events to be generated", thanks to + Paul Vojta. This might have been fixed in this new release -- I can't + reproduce it, and neither can upstream, with this versions of fvwm. + (Closes: #356000). + * Bug fix: "/etc/menu-methods/fvwm should respect l10n menu entries", + thanks to Michelle Konzack. Don't add hotkeys to internationalized + menu entries. (Closes: #405047, #406171). + * Bug fix: "gaim 1.4.0 steals focus when popping up the dialog window", + thanks to Vincent Bernat. This seems to have been fixed in the new + version. (Closes: #318766). + * Added XS-VCS-Arch and XS-VCS-Browse entries to the control file. + + -- Manoj Srivastava Tue, 17 Apr 2007 13:36:46 -0500 + +fvwm (1:2.5.18-3) unstable; urgency=high + + * Bug fix: "[INTL:ta] debconf PO translations for the package fvwm", + thanks to Tirumurti Vasudevan (Closes: #412819, #412821). + * Bug fix: "[INTL:ml] Malayalam translation update", thanks to Praveen A + (Closes: #412699). + * Bug fix: "fvwm: [INTL:ru] Russian debconf templates translation", + thanks to Yuri Kozlov (Closes: #412550). + * Bug fix: "fvwm : [INTL:pt] Portuguese translation for debconf + messages", thanks to Traduz ML (Closes: #412425). + * Bug fix: "[INTL:gl] Galician debconf templates translation for fvwm", + thanks to Jacobo Tarrio (Closes: #412364). + * Bug fix: "fvwm: [INTL:es] Spanish po-debconf translation", thanks to + Javier Fernández-Sanguino Peña (Closes: #403423). + * Bug fix: "suggests a package that doesn't exist: fvwm-themes", thanks + to Gonéri Le Bouder (Closes: #408312). + * Bug fix: "tighten build dependencies on libfribidi", thanks to + Michelle Konzack (Closes: #407174). + + -- Manoj Srivastava Fri, 2 Mar 2007 01:48:03 -0600 + +fvwm (1:2.5.18-2) unstable; urgency=high + + * Apply better escapes for dir names in the menu dir scanner. + + -- Manoj Srivastava Fri, 10 Nov 2006 23:45:55 -0600 + +fvwm (1:2.5.18-1) unstable; urgency=low + + * New upstream release. + - If a window started fullscreen, leaving fullscreen state now + properly unmaximizes and resizes the window. + - Fixed the ForeColor/HilightFore styles that were broken in + 2.5.17. + - FvwmPager can now move icons with the !IconTitle style. + - Fixed drawing of icons that are moved to a different desk. + - FvwmPager no longer tries to move non-movable windows. + - FvwmPager now moves all windows as user requests. + - FvwmPager no longer displaces windows with title and border + sizes on moves. + - TestRc now correctly matches Break, and $[cond.rc] is + expanded for Break. + - Fixed several 64-bit architecture problems with + XGetWindowProperty(). Xine works much better on 64-bit + machines. + - Fixed handling of ClickToFocusPassesClick with the EWMH + desktop (e.g. using nautilus). + - Fixed handling of windows that are unmapped and mapped again + too fast (e.g. fpga_editor). + * Bug fix: "HilightFore Style option no longer works", thanks to Brendan + O'Dea (Closes: #383435). + * Bug fix: "fvwm: should suggest perl packages for FvwmTabs", thanks to + Sylvain Sauvage (Closes: #382338). + * Bug fix: "fvwm: some menu breakage", thanks to Paul Vojta + (Closes: #384695). + * Bug fix: "fvwm: MenuStyle <fontcolor> option ignored (Black used + instead)", thanks to Nicola Manini (Closes: #385952). + * Bug fix: "fvwm: segfaults at startup when Xlib does not like locale", + thanks to Henning Makholm (Closes: #384729). + * Bug fix: "update-menu should respect $FVWM_USERDIR if set", thanks to + Michelle Konzack (Closes: #382517). + + -- Manoj Srivastava Tue, 12 Sep 2006 01:19:54 -0500 + +fvwm (1:2.5.17-1) unstable; urgency=low + + * New upstream release + * Bug fix: "fvwm: EWMH acronymn is erroneous in the description field.", + thanks to Thomas Adam (Closes: #380025). + * New features: + - New MenuStyle options TitleFont, TitleColorset and + HilightTitleBack. + - New command PressButton in module FvwmButtons for being able + to emulate button press via other means than the mouse. + - New wrap options to EdgeScroll command for wrapping with pixel + distances. + - New Style option UnderMousePlacement. + - Unused arguments to Style options generate warnings. + - The name style names match against can be augmented by the + X-resource "fvwmstyle". + - New options, Reverse and UseStack, to All command. + - WindowShade can now reshade windows using the Last direction. + - Positional parameters to complex functions can now be expanded + using $[n], $[n-m], $[n-] and $[*] expressions. + - The width and height arguments of the Resize command now + accept the prefix 'w' to allow resizing relative to the + current window size. + - New command ModuleListenOnly. + - New "Periodic" option added to Schedule command. + * Bug Fixes: + - Fixed detection of running non-ICCCM2 wm (bug #3151). + - Fixed drawing of menus with the sidepic on the right. + - EdgeScroll no longer divides pixel distances >1000 by 1000. + (bug #3162) + - The configure script can now cope with four-part version + numbers when detecting some libraries. + - The WarpToWindow command followed by Move in a complex + function now uses the correct pointer position. + - The menu style TitleWarp does no longer warp the pointer for + root menus (as it is documented). + - Fixed detection of safe system version of mkstemp. + - Fixed the conditions Iconifiable, Fixed, FixedSize, + Maximizable and Closable. + - Fixed problem with window outline and placement position + running out of sync. + - FvwmConsole no longer conflicts with Cygwin stdio (bug #3772). + - FvwmGtk now configures correctly on Cygwin (bug #3772). + - Fixed tempfile vulnerabilities in FvwmCommand. + * Bug fix: "Default Charset is wrong", thanks to Jonny. See + http://www.fvwm.org/cgi-bin/fvwm-bug/incoming?id=1647 for details. + (Closes: #360418). + + -- Manoj Srivastava Tue, 8 Aug 2006 20:13:20 -0500 + +fvwm (1:2.5.16-2) unstable; urgency=low + + * Synchronized from CVS, since we have a few bugs that were addressed + here. + * Bug fix: "fvwm starts when other window manager is already active", + thanks to Bernhard R. Link (Closes: #328621). + * Bug fix: "fvwm: Window title buttons and viewport scrolling stop + working.", thanks to Per Bojsen (Closes: #296348). + * Bug fix: "fvwm clashes with fvwmtabs", thanks to Micha Feigin + (Closes: #350560). + + -- Manoj Srivastava Tue, 7 Feb 2006 18:20:33 -0600 + +fvwm (1:2.5.16-1) unstable; urgency=low + + * New upstream release. + * New features: + - If the pointer can not be grabbed in functions, a message is + printed to the console instead of beeping. + - Variables can be nested, like $[desk.name$[desk.n]]. + - Obsolete one-letter variables work, but generate warnings now. + - Windows can be placed by any button (now also >3). + - It is now possible to redefine the buttons usable to finish + window movement and manual placement. + - New window condition PlacedByButton. + - MenuStyle pairs can be negated by prefixing '!'. + - New generic tabbing module - FvwmTabs. + - New Style option: EWMHIgnoreWindowType. + - New MenuStyle options: MouseWheel, ScrollOffPage and + TrianglesUseFore. + - New option "screen" to Move and ResizeMove commands to allow + specifying the target Xinerama screen. + * Bug Fixes: + - Supported a new fribidi version 0.10.5 in addition to 0.10.4. + - Better look for windows with "BorderStyle TiledPixmap". + - Some EWMH-related 64-bit fixes. + - Fixed segmentation fault when replacing title of title only + menus (Bug #1121). + - Fixes for resizing of shaded windows and resizing/moving + windows with complex functions. + + -- Manoj Srivastava Sun, 22 Jan 2006 00:46:42 -0600 + +fvwm (1:2.5.14-6) unstable; urgency=low + + * Try and see if build depending on fontconfig makes adifference, since + the configure script does seem to look for it. + + -- Manoj Srivastava Tue, 20 Dec 2005 23:30:35 -0600 + +fvwm (1:2.5.14-5) unstable; urgency=low + + * Use modular X11 packages in build dependency. + + -- Manoj Srivastava Sat, 17 Dec 2005 00:22:37 -0600 + +fvwm (1:2.5.14-4) unstable; urgency=low + + * fvwm: debconf-updatepo has not been launched. Well, updatepo is always + called during build, so this is not as serious a bug as it appears. I + am also not in favour of modifying things on disk during clean -- + clean returns the directory to the state it was in before. So, this is + a new upload, with debconf-updatepo already run, (Closes: #336203). + * fvwm: French debconf templates translation update, thanks to Jean-Luc + Coulon. (Closes: #336300). + + -- Manoj Srivastava Sun, 30 Oct 2005 10:14:17 -0600 + +fvwm (1:2.5.14-3) unstable; urgency=low + + * Bug fix: "fvwm: should depend on gdk-imlib11 instead of gdk-imlib1", + thanks to Domenico Andreoli (Closes: #332409). + * Bug fix: "fvwm: [INTL:sv] Swedish debconf templates translation", + thanks to Daniel Nylander (Closes: #333794). + + -- Manoj Srivastava Thu, 20 Oct 2005 12:36:45 -0500 + +fvwm (1:2.5.14-2) unstable; urgency=low + + * Bug fix: "please rebuild with libreadline5-dev as build dependency", + thanks to Matthias Klose (Closes: #326359). + * Bug fix: "please rebuild with libreadline5-dev as build dependency", + thanks to Matthias Klose (Closes: #326360). + + -- Manoj Srivastava Thu, 22 Sep 2005 08:36:47 -0500 + +fvwm (1:2.5.14-1) unstable; urgency=low + + * New upstream release + * New features: + + - Fvwm now officially supports 64-bit architertures. + - New Test conditions EnvIsSet, EnvMatch, EdgeHasPointer and + EdgeIsActive. + - New window condition FixedPosition. + + * New module features: + + - FvwmPerl module supports window context when preprocessing. + - FvwmPerl module accepts new --export option that by default + defines two fvwm functions "Eval" and ".", to be used like: + + FvwmPerl -x + Eval $a = $[desk.n] - 2; cmd("GotoDesk 0 $a") if $a >= 0 + . Exec xmessage %{2 + cos(0)}% # embedded calculator + + - New FvwmProxy option ProxyIconified. + - New FvwmTaskBar option Pad to control the gap between + buttons. + + * Bug Fixes: + + - Fixed a Solaris compiler error introduced in 2.5.13. + - Fixed a hang with layers set by applications (e.g. AbiWord). + - GotoDesk with a relative page argument now wraps around at + the end of the given range as documented. (Bug #1396). + - PopupDelayed menu style option was not copied on + CopyMenuStyle. + - Transparent Animated menus with non-transparent popup were + not animated correctly. + - Supported euc-jp class of encodings. + - A window's default layer is no longer set to 0 durin a + restart. + - Fixed an annoying MouseFocus/SloppyFocus problem in + conjunction with EdgeResistance + EdgeScroll (sometimes a + window did noit get the focus as it should have). This + problem first occured in 2.5.11. + + -- Manoj Srivastava Fri, 26 Aug 2005 00:38:42 -0500 + +fvwm (1:2.5.13-0.CVS.2005.08.08.01-1) unstable; urgency=low + + * New upstream CVS version. + - Fvwm now officially supports 64-bit architertures. + * Fixed a Solaris compiler error introduced in 2.5.13 + * Fixed a hang with layers set by applications (e.g. AbiWord). + * Bug fix: "GotoDesk doesn't wrap around like docs say it should", + thanks to Chip Salzenberg. GotoDesk with a relative page argument now + wraps around at the end of the given range as documented. (Closes: #238737). + + -- Manoj Srivastava Mon, 8 Aug 2005 20:55:52 -0500 + +fvwm (2.5.130.CVS.2005.07.19.01-1) unstable; urgency=low + + * New upstream CVS version. + * Bug fix: "fvwm broken properties on 64-bit hosts [PATCH]", thanks to + Marc Lehmann (Closes: #318504). + + -- Manoj Srivastava Tue, 19 Jul 2005 21:58:26 -0500 + +fvwm (2.5.13-1) unstable; urgency=low + + * New upstream release + + -- Manoj Srivastava Tue, 19 Jul 2005 15:58:22 -0500 + +fvwm (2.5.12.0.CVS.2005.07.09.01-1) unstable; urgency=low + + * Bug fix: "FTBFS: configure is not executable", thanks to Christian + T. Steigies. The problem was that since the CVS upstream does not + contain ./configure, it was created by the diff.gz -- and that leaves + all the autoconf related scripts non-executable. Added logic to + ./debian/rules to ensure that the scripts are made executable before + use, iff they exist and are not already executable. (Closes: #317565). + + -- Manoj Srivastava Sat, 9 Jul 2005 15:06:06 -0500 + +fvwm (2.5.12.0.CVS.2005.07.08.01-1) unstable; urgency=low + + * New release snagged from CVS. + Fixes + - The MoveToPage command did not work without arguments in + 2.5.11 and 2.5.12. + - Mouse/Key command no args possible core dump. + - Direction with no args possible core dump. + - FvwmScript periodic tasks run too often. + - Perl modules did not work on 64 machines. + - FvwmDebug did not report any extended messages. + - fvwm-menu-desktop supports mandriva. + - fvwm-menu-desktop when verifying executable, allow full path. + Features + - FvwmIconMan: MaxButtonWidth and MaxButtonWidthByColumns options. + - FvwmIconMan: added tool tips with Tips, TipsDelays, TipsFont, + TipsColorset, TipsFormat, TipsBorderWidth, TipsPlacement, + TipsJustification and TipsOffsets options. + - FvwmButtons: PressColorset & ActiveColorset options for + _individual_ buttons. + * Bug fix: "fvwm segfaults when pressing Ctrl while waiting", thanks to + Hugo Haas. Fixed in this release. (Closes: #278443). + * Bug fix: "/usr/bin/fvwm2: Click into windows doesn't raise them / + FPClickRaisesFocused broken?", thanks to Thorsten Gunkel + (Closes: #291291). + * Bug fix: "fvwm: post installation script error", thanks to Adrian + Mariano. (Closes: #290601). + * Bug fix: "fvwm: 'Mouse 1 T A Move' does not work as expected", thanks + to Alexander Kotelnikov (Closes: #293368). + * Bug fix: "fvwm: Fullscreen should not require + EWMHUseStackingOrderHints style", thanks to Per von Zweigbergk + (Closes: #276434). + * Bug fix: "fvwm: SnapAttraction and SnapGrid do not work any more", + thanks to Samuel Thibault (Closes: #274908). + * Bug fix: "fvwm: Fvwm is ICCCM2 compliant now.", thanks to Thomas Adam + (Closes: #305080). + * Bug fix: "INTL:vi", thanks to Clytie Siddall (Closes: #311751). + * Bug fix: "fvwm: [INTL:de] German PO file corrections", thanks to Jens + Seidel (Closes: #313712). + * Bug fix: "please add "Style OpenOffice* NoFuncHint" to + default settings", thanks to Tim Froggatt (Closes: #306991). + + -- Manoj Srivastava Sat, 9 Jul 2005 09:10:31 -0500 + +fvwm (2.5.12-5) unstable; urgency=low + + * Bug fix: "fvwm: FvwmProxy man page formatting typo .IP", thanks to + Kevin Ryde (Closes: #285386). + * Bug fix: "fvwm: fvwm-menu-desktop man page formatting typo", thanks to + Kevin Ryde (Closes: #285387). + * only chmod menu methods if the file exists. (Closes: #296944). + + * Bug fix: "FTBFS (maybe): configure fails to detect gdk-imlib", thanks + to Chip Salzenberg. Based on a patch by Harald Dunkel + (Closes: #238725). + + -- Manoj Srivastava Thu, 17 Mar 2005 17:34:11 -0600 + +fvwm (2.5.12-4) unstable; urgency=low + + * Bug fix: "fvwm: [INTL:pt_BR] Please consider adding the attached + Brazilian Portuguese translation", thanks to Andre Luis Lopes + (Closes: #279412). + * Bug fix: "fvwm: Japanese po-debconf template translation (ja.po)", + thanks to Hideki Yamane (Closes: #281071). + + -- Manoj Srivastava Fri, 19 Nov 2004 11:01:44 -0600 + +fvwm (2.5.12-3) unstable; urgency=low + + * Well, libfribidi0 0.10.4-5 had a busted shlibs file, which meant that + the buildd's built fvwm which was un-installable. Added a build + conflict with that version, hoping that that shall fix things. + * Bug fix: "fvwm 2.5.12-2 depends on libfribidi0 (>= 0.10.5) on + powerpc", thanks to Vincent Bernat (Closes: #278825). + + -- Manoj Srivastava Fri, 29 Oct 2004 13:31:55 -0500 + +fvwm (2.5.12-2) unstable; urgency=low + + * Bug fix: "fvwm: setup95 does not find KDE", thanks to Yann Dirson + (Closes: #247594). + * Bug fix: "fvwm: OpenOffice Impress Slide Show fails to fill Full + Screen", thanks to Marten van Kerkwijk. This was actually fixed in the + last upload (see http://www.hpc.uh.edu/fvwm/archive/0406/msg00041.html), + But has only been tested recently. (Closes: #269533). + + -- Manoj Srivastava Tue, 26 Oct 2004 13:33:12 -0500 + +fvwm (2.5.12-1) unstable; urgency=low + + * New upstream release. + * New commands: - EdgeLeaveCommand + * New module features: - FvwmIconMan: ShowOnlyFocused option. + * fixed xemacs growing or shrinking when title height changed; + * use type XPointer for last argument of predicate procedures for + XCheckPeekIfEvent and XCheckIfEvent, not char *, fixed core dump + * removed useless and broken SETM_ macros + * fixed resetting user states + + -- Manoj Srivastava Wed, 6 Oct 2004 14:41:17 -0500 + +fvwm (2.5.11-1) unstable; urgency=low + + * New upstream release. Please see the NEWS file for details. + * Bug fix: "[l10n] Initial Czech translation of fvwm debconf messages", + thanks to Miroslav Kure (Closes: #273519). + + -- Manoj Srivastava Fri, 1 Oct 2004 02:13:40 -0500 + +fvwm (2.5.10-13) unstable; urgency=medium + + * priority medium, since it fixes the placement bug, and stops filling + up .xsession-errors with debug messages. + * Bug fix: "[INTL:nl] updated dutch po-debconf translation", thanks to + Luk Claes (Closes: #270788). + * Bug fix: "fvwm: Style Mozilla* StartsOnPage starts on the wrong page", + thanks to Jeroen Nijhof. The problem was diagnosed, and fixed, by Paul + Vojta, who also reported the problem and the fix upstream. + (Closes: #248231). + * Bug fix: "/usr/share/xsessions/fvwm.desktop", thanks to David + Schweikert (Closes: #266092). + * Bug fix: "fvwm: French program translation", thanks to Jean-Luc Coulon + (f5ibh) (Closes: #265931). + * Bug fix: ".fvwm2rc missing from + /usr/share/doc/fvwm/sample.fvwmrc/manoj", thanks to Christian Ohm + (Closes: #267849). + * Bug fix: "fvwm 2.5.10-9 filling up .xsession-errors", thanks to + Michelle Konzack (Closes: #271481). + + -- Manoj Srivastava Wed, 22 Sep 2004 19:43:40 -0500 + +fvwm (2.5.10-12) unstable; urgency=low + + * Bug fix: "Pixmaps, icons, etc. don't work in remote fvwm", thanks to + Norbert Buchmuller (Closes: #250521). + * Bug fix: "fvwm: FvwmTaskBar & FvwmButtons crash when managing + remote display", thanks to Norbert Buchmuller (Closes: #251539). + + -- Manoj Srivastava Fri, 13 Aug 2004 22:54:18 -0500 + +fvwm (2.5.10-11) unstable; urgency=low + + * Bug fix: "fvwm: menu-method fails when using dpkg-reconfigure", thanks + to Jaume, who also figured out the cause. (Closes: #261574). + * Bug fix: "fvwm: update-menus fails", thanks to Mykola A. Nickishov + (Closes: #264225). + * Added german translation. + * Bug fix: "fvwm-root scrambles XRoot with --retain-pixmap even if + pixmap does not exist", thanks to Niv ALTIVANIK. I backported the + changes made in to CVS instead. (Closes: #263533). + + -- Manoj Srivastava Wed, 11 Aug 2004 14:36:20 -0500 + +fvwm (2.5.10-10) unstable; urgency=low + + * NMU ACK: "fvwm: FTBFS: build target requires root privs", thanks to + Tollef Fog Heen (Closes: #258122). + * Bug fix: "fvwm: Updated German translation of the debconf templates", + thanks to Erik Schanze (Closes: #256620). + * No longer call the deprecated wm-menu-config script. + + -- Manoj Srivastava Wed, 21 Jul 2004 11:17:10 -0500 + +fvwm (2.5.10-9.1) unstable; urgency=low + + * NMU (at maintainer's request) + * Bug fix: Replace make_directory with mkdir -p in the config target. This + should make the package build again, without root privs. Thanks to Goswin + Brederlow for discovering the bug. (Closes: #258122). + + -- Tollef Fog Heen Mon, 12 Jul 2004 13:17:43 +0200 + +fvwm (2.5.10-9) unstable; urgency=low + + * Bug fix: "fvwm: depends on gnome", thanks to Mario 'BitKoenig' Holbe + and others. Since it seems that the added functionality provided by + compiling in GNOME libraries was not worth the bloat caused by the + requirement to install the large chunks of GNOME, a new package, + fvwm-gnome, has been created, and fvwm proper shall not depend on + gnome. (Closes: #256136). + * Bug fix: "fvwm: [INTL:fr] French debconf templates translation", + thanks to Christian Perrier (Closes: #256131). + + -- Manoj Srivastava Fri, 25 Jun 2004 13:26:15 -0500 + +fvwm (2.5.10-8) unstable; urgency=low + + * Bug fix: "fvwm: should depend on librplay3", thanks to Ludovico + Gardenghi. Fixed a complex bug related to invoking dpkg-shlibdeps + which did not find all executables. (Closes: #247953). + + -- Manoj Srivastava Wed, 23 Jun 2004 22:11:33 -0500 + +fvwm (2.5.10-7) unstable; urgency=low + + * Switched me and sacha around as maintainers; not having me as + maintainer made it harder for me to get the reports, and since sacha + is not active at this point, it should not matter. We can always + switch it back later. + * Bug fix: "NEWS doesn't mention upgrades", thanks to David B Harris + (Closes: #247938). + * Bug fix: "fvwm: Please add German translation of the debconf + templates", thanks to Erik Schanze and Helge Kreutzmann + (Closes: #252830, 252308). + * Bug fix: "[INTL:nl] new Dutch po-debconf translation", thanks to Luk + Claes (Closes: #251246). + * Bug fix: "fvwm: [INTL:fr] French debconf templates translation", + thanks to Christian Perrier (Closes: #249076). + * Bug fix: "Typos in debconf template", thanks to Jens Seidel + (Closes: #250560). + * Bug fix: "fvwm menu-methods should quote title() properly", thanks to + Bill Allombert (Closes: #251230). + + -- Manoj Srivastava Wed, 23 Jun 2004 13:37:12 -0500 + +fvwm (2.5.10-6) unstable; urgency=low + + * Bug fix: "fvwm: Could you add a Session file for gdm ?", thanks to + Antoine Sirinelli (Closes: #246923). + * debian/NEWS.Debian: Bug fix: "fvwm: lacks information about upgrading + configuration", thanks to Yann Dirson (Closes: #247591). + * Bug fix: "fvwm: new way of handling configuration should provide a + smooth upgrade path", thanks to Yann Dirson. Well, the upgrade path is + smooth enough, though not automated, since this radical a change can't + easily be automated, and the old configuration is horribly out of + date anyway. (Closes: #247599). + + -- Manoj Srivastava Fri, 7 May 2004 00:59:50 -0500 + +fvwm (2.5.10-5) unstable; urgency=low + + * Bug fix: "fvwm: postinst sets bogus alternative", thanks to Martin + Pitt (Closes: #245443). + + -- Manoj Srivastava Sat, 24 Apr 2004 15:26:35 -0500 + +fvwm (2.5.10-4) unstable; urgency=low + + * Bug fix: "FVWM fails to compile on mips/mipsel machines", thanks to + Manoj Srivastava (Closes: #244554). + * Bug fix: "still looking in the wrong location for system.fvwm2rc", + thanks to Sean Finney (Closes: #243926). + * Bug fix: "fvwm: strange files under /usr/share/doc/fvwm/", thanks to + Roland Stigge (Closes: #242859). + + -- Manoj Srivastava Mon, 19 Apr 2004 03:45:50 -0500 + +fvwm (2.5.10-3) unstable; urgency=low + + * Bug fix: "There should be a symlink /usr/lib/fvwm/current -> + VERSION", thanks to Karl Hegbloom. Since we no longer ship a .fvwmrc + file, we do not have to provide compatibility symlinks for dir changes + on upgrade. (Closes: #218527). + * Bug fix: "fvwm: unnecessary ~/.fvwm/ creation", thanks to Neil W. Van + Dyke. Now the .fvwm file is created only on explicit user command. + (Closes: #193761). + * Bug fix: "Latest unstable (2.5.10-2) can't find system.fvwm2rc", + thanks to Warren Overholt. Now ask a debconf question and abort + upgrade unless the user is ready for the new fvwm. (Closes: #242662). + + -- Manoj Srivastava Thu, 8 Apr 2004 12:32:39 -0500 + +fvwm (2.5.10-2) unstable; urgency=low + + * Change the menu location to be consistent with where Debian has + traditionally put it. + * Bug fix: "fvwm: patch for the fvwm-update-menu script", thanks to + Julian Gilbey. We no longer have a system default menu. + (Closes: #208501). + * Bug fix: "fvwm: Alt-Tab behaves wrong when NeverFocus window exists", + thanks to Alexandra N. Kossovsky. This is no longer applicable. + (Closes: #207499). + + -- Manoj Srivastava Wed, 7 Apr 2004 10:40:14 -0500 + +fvwm (2.5.10-1) unstable; urgency=medium + + * New upstream release. This upload includes a number of security fixes, + see http://securitytracker.com/alerts/2004/Jan/1008781.html. Security + fixes in fvwm-menu-directory (BugTraq id 9161), + fvwm_make_directory_menu.sh, fvwm_make_browse_menu.sh. + * Bug fix: "FTBFS: setgid control directory", thanks to Matt Kraai. The + build system has been totally redone for this release. + (Closes: #240379). + * We no longer include fvwm-setup-background, which used to invoke + xv. Instead, we use our own fvwm-root/xpmroot; which is a self + contained binary. (Closes: #227548). + * Bug fix: "fvwm: /usr/lib/menu/fvwm: restart command of fvwm2 is + incorrect", thanks to Jeff Sheinberg (Closes: #185758, 190584). + * Bug fix: "fvwm: seems to have a memory leak", thanks to + pmaydell@chiark.greenend.org.uk. Fvwm no longer appear to grow + infinitely in size, as observed over several weeks. This is a very + different code bas than what the bug was reported against. + (Closes: #186660). + * Bug fix: "fvwm: hangs on (re)start with xfstt (unix/:7101) in font + path", thanks to Jeff Sheinberg. (Closes: #197630). + * Bug fix: "fvwm: Doesn't install", thanks to Richard Braakman. The + maintainer scripts have been totally redone. (Closes: #202612). + * Bug fix: "fvwm: FvwmTaskBar does not start at all", thanks to + Christian Beier (Closes: #210902). + * Bug fix: "fvwm: Fvwm package has unneed dependency on libgtk", thanks + to Victor B.Wagner (Closes: #217968). + * Bug fix: "fvwmiconbox: dies when window title >280 chars", thanks + to Alexander Zangerl . Works fine with the example in the bugreport. + (Closes: #220155). + * Bug fix: "fvwm is missing dependency on libfribidi0", thanks to + Christoph Berg (Closes: #242017). + * Bug fix: "fvwm: /usr/share/man/man1/x-window-manager.1.gz is a + dangling symlink", thanks to Vincent Lefevre (Closes: #187084). + * Bug fix: "fvwm: A new version of fvwm is available", thanks to Manoj + Srivastava (Closes: #218571). + * Bug fix: "fvwm: please package fvwm 2.5.x", thanks to Marco d'Itri + (Closes: #189664). + + -- Manoj Srivastava Tue, 6 Apr 2004 15:03:58 -0500 + +fvwm (2.5.8-0.3) experimental; urgency=low + + * Redid the build system to meet my standards. + * Start with a minimal difference from the upstream changes. + + -- Manoj Srivastava Tue, 25 Nov 2003 16:52:40 -0600 + +fvwm (2.5.8-0.2) unstable; urgency=low + + * Removed extraneous configuration option --enable-multibyte, thanks to + comments from Mikhael Goikhman + * Updated build depends to also depend on gdk-imlib-dev, to get the + missing GNOME functionality. + + -- Manoj Srivastava Tue, 11 Nov 2003 15:09:07 -0600 + +fvwm (2.5.8-0.1) unstable; urgency=low + + * New upstream release, local modification + + -- Manoj Srivastava Mon, 10 Nov 2003 12:31:09 -0600 + +fvwm (2.4.16-2) unstable; urgency=low + + * In previous revision config.{sub,guess} changes, introduced in + 2.4.15-2, had been reverted by mistake. This release put them back. + + -- Alexander Kotelnikov Thu, 10 Jul 2003 15:10:36 +0000 + +fvwm (2.4.16-1) unstable; urgency=low + + * new upstream + * FvwmIcoMan fix (closes: #182711, #193703) + * NoWarp option added to Menu command (closes: #188274) + * The latter also applies to WindowList (closes: #188272) + + -- Alexander Kotelnikov Tue, 8 Jul 2003 15:40:59 +0400 + +fvwm (2.4.15-2) unstable; urgency=low + + * Fix for purging fvwm if menu package is not installed (closes: #182322) + * outdated config.{sub,guess} fix (closes: #185297) + + -- Alexander Kotelnikov Sat, 22 Mar 2003 23:22:58 +0000 + +fvwm (2.4.15-1) unstable; urgency=low + + * debian/rules changed heavily (debhelper dependency removed) + * new upstream (closes: #171810, #176561) + * system.fvwm2rc changed (closes: #133611, #157293, #163596) + * fvwm man page fixed (closes: #171089) + + -- Alexander Kotelnikov Mon, 27 Jan 2003 05:59:59 +0300 + +fvwm (2.4.10-2) unstable; urgency=low + + * Bugfix (closes: #161282) + + -- Alexander Kotelnikov Fri, 20 Sep 2002 00:23:30 +0400 + +fvwm (2.4.10-1) unstable; urgency=low + + * New upstream + + -- Alexander Kotelnikov Mon, 16 Sep 2002 02:34:53 +0400 + +fvwm (2.4.9-1) unstable; urgency=low + + * New upstream + + -- Alexander Kotelnikov Thu, 5 Sep 2002 23:10:11 +0400 + +fvwm (2.4.8-1) unstable; urgency=low + + * New upstream (closes: #150488) + + -- Alexander Kotelnikov Sun, 23 Jun 2002 08:18:38 +0400 + +fvwm (2.4.7-2) unstable; urgency=low + + * fixed menu file (closes: #145779) + * minor menu changes + + -- Alexander Kotelnikov Sat, 4 May 2002 17:08:07 +0400 + +fvwm (2.4.7-1) unstable; urgency=low + + * New upstream + + -- Alexander Kotelnikov Tue, 30 Apr 2002 03:11:30 +0400 + +fvwm (2.4.6-2woody1) stable; urgency=high + + * "No, restart Fvwm" command correction. Previous was to run + /usr/bin/X11/fvwm2, even fvwm is in /usr/bin since 2.4.5-2 + (closes: #153983) + + -- Alexander Kotelnikov Sat, 27 Jul 2002 22:16:35 +0000 + +fvwm (2.4.6-2) unstable; urgency=high + + * fix for old /usr/bin/X11/ alternatives (closes: #140806) + + -- Alexander Kotelnikov Mon, 8 Apr 2002 20:40:29 +0400 + +fvwm (2.4.6-1) unstable; urgency=low + + * New upstream version + * closes: #137239, thanks to Mikael Hedin + * really closes: #134775 + + -- Alexander Kotelnikov Mon, 11 Mar 2002 01:03:25 +0300 + +fvwm (2.4.5-3) unstable; urgency=low + + * more fixes to alternatives (closes: #134775) + + -- Alexander Kotelnikov Thu, 21 Feb 2002 00:21:49 +0300 + +fvwm (2.4.5-2) unstable; urgency=low + + * moving from /usr/X11R6 to /usr to satisfy Debian policy 12.8.7 + * prerm fixed to honour slave alternatives removal, + hope it closes: #133335 + * debian/conffiles removed (closes: #133620) + + -- Alexander Kotelnikov Fri, 15 Feb 2002 11:15:22 +0300 + +fvwm (2.4.5-1) unstable; urgency=low + + * New upstream version + * changes to fvwm-update-menus (closes: #129487) + + -- Alexander Kotelnikov Mon, 28 Jan 2002 11:08:44 +0300 + +fvwm (2.4.4-5) unstable; urgency=low + + * FvwmConsole changes (closes: #101221) + * preinst changed (closes: #129309) + + -- Alexander Kotelnikov Tue, 15 Jan 2002 03:01:58 +0300 + +fvwm (2.4.4-4) unstable; urgency=low + + * build with libstroke0 (closes: #35600) + * setup-background is back (closes: #111519) + * please note, setup-background call is removed from system.fvwm2rc + * fvwm-update-menu provides updating menus on the fly (closes: #91878) + * FvwmButtons fix (closes: #109686) + * CMD_Exec() change (closes: #49808) + + -- Alexander Kotelnikov Fri, 11 Jan 2002 01:17:08 +0300 + +fvwm (2.4.4-3) unstable; urgency=low + + * fix in fvwm/read.c (closes: #110909) + * fix in fvwm/style.c (closes: #110106) + * added some manual pages links (closes: #52493, #52495, #52496) + + -- Alexander Kotelnikov Tue, 8 Jan 2002 03:00:16 +0300 + +fvwm (2.4.4-2) unstable; urgency=low + + * fixed default system.fvwm2rc (closes: #67322, #68487, #111513) + * fixed menu-method (closes: #126191) + * some examples are back (closes: #111510) + * fix in README.sysrc (closes: #111509) + * ChangeLog is installed in /usr/share/doc/fvwm (closes: #116974) + + -- Alexander Kotelnikov Sat, 5 Jan 2002 17:16:03 +0300 + +fvwm (2.4.4-1) unstable; urgency=low + + * New upstream version (closes: bug#113181) + * all modifications of /etc/X11/fvwm/ are put away (closes: + #109821,#110024,#110908) + * fixed update-alternatives stuff (closes: #123603,#123650) + * menu-related fixes (closes: #88270,#88160,#108846) + + -- Alexander Kotelnikov Thu, 3 Jan 2002 19:36:19 +0300 + +fvwm (2.4.0-3) unstable; urgency=low + + * fixed bugs in system.fvwm2rc.{default,old} + * (irrelevant to previous line) + * closes #88270,#88160 + + -- Alexander Kotelnikov Fri, 24 Aug 2001 00:16:27 +0400 + +fvwm (2.4.0-2) unstable; urgency=low + + * debian/ bugfix + * closes: #108858,#109172,#109174,#109492,#109505,#108846 + + -- Alexander Kotelnikov Thu, 23 Aug 2001 04:05:06 +0400 + +fvwm (2.4.0-1) unstable; urgency=low + + * New upstream + * Needs to be cleaned a little, but needs to be released too + + -- Alexander Kotelnikov Sat, 4 Aug 2001 00:17:38 +0400 + +fvwm (2.2.5-1.1) unstable; urgency=low + + * NMU + * Fix Build-depends. Closes: #105060 + + -- LaMont Jones Thu, 19 Jul 2001 10:39:13 -0600 + +fvwm (2.2.5-1) unstable; urgency=low + + * new upstream version + + -- Alexander Kotelnikov Tue, 27 Feb 2001 01:10:36 +0300 + +fvwm (2.2.4-5) unstable; urgency=low + + * complied without rplay library + * debian/* bugfix (closes: #85317, #71144, #72301) + + -- Alexander Kotelnikov Fri, 9 Feb 2001 17:06:13 +0300 + +fvwm (2.2.4-4) unstable; urgency=low + + * menu-method correction from Yann Dirson applied (closes: #79162) + + -- Alexander Kotelnikov Sun, 24 Dec 2000 22:39:03 +0300 + +fvwm (2.2.4-3) unstable; urgency=low + + * fvwm got new maintainer + + -- Alexander Kotelnikov Fri, 1 Dec 2000 20:47:31 +0300 + +fvwm (2.2.4-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: fix Build-Depends to refer to libxpm4-dev instead of + xpm4g-dev. + * debian/rules: + - fixed lame bug in dirpack rule (calling tar cf with no files to + archive, tut tut). + - don't ship keyboard.xpm, in anticipation of xlibs 4.0 having it + * Recompiled against modern xpm library to generate proper dependencies. + + -- Branden Robinson Wed, 6 Sep 2000 15:20:30 -0500 + +fvwm (2.2.4-2) frozen unstable; urgency=low + + * Correct fatal syntax errors in fvwmrc_convert (so uploading to frozen + as well as unstable) + * Correct Build-Depends for newest potato libraries (libncurses and + libreadline) and include auto{conf,make} (for some reason, the build + uses them) + + -- Julian Gilbey Wed, 19 Jan 2000 00:29:47 +0000 + +fvwm (2.2.4-1) unstable; urgency=low + + * New upstream source (very minor bug fixes) + * Remove shlibs.local now that libreadlineg2 has been fixed. + + -- Julian Gilbey Thu, 9 Dec 1999 01:48:41 +0000 + +fvwm (2.2.3-4) unstable; urgency=low + + * Provide x-window-manager (closes: #51830) + * Correct setup-background.1x manpage (closes: #46529) + * No longer use dh_installwm. (Prevents configure-time warnings) + + -- Julian Gilbey Tue, 7 Dec 1999 18:09:50 +0000 + +fvwm (2.2.3-3) unstable; urgency=low + + * Add build dependencies + * Remove install-stamp target from debian/rules + * Recompile to use new librplay3 library + + -- Julian Gilbey Mon, 6 Dec 1999 17:13:48 +0000 + +fvwm (2.2.3-2) unstable; urgency=low + + * Correct fvwm-common postinst bug (closes: #49445) + + -- Julian Gilbey Sun, 7 Nov 1999 18:05:51 +0000 + +fvwm (2.2.3-1) unstable; urgency=low + + * New upstream version + * Correct Depends and Suggests lines (closes: #49026) + + -- Julian Gilbey Tue, 2 Nov 1999 22:52:01 +0000 + +fvwm (2.2.2-5) unstable; urgency=low + + * Added appropriate IconPath and PixmapPath lines to system.fvwm2rc for + Debian's very messy situation + + -- Julian Gilbey Mon, 1 Nov 1999 09:23:59 +0000 + +fvwm (2.2.2-4) unstable; urgency=low + + * Corrected copying error: twm postinst -> fvwm postinst had fvwm2.1x by + mistake (closes: #48756) + * Correct update.warn syntax error (closes: #48841) + + -- Julian Gilbey Sun, 31 Oct 1999 23:23:48 +0000 + +fvwm (2.2.2-3) unstable; urgency=medium + + * Changed "Exec" to "Exec exec" in menu-method file (closes: #47291) + * Changed perl5 dependency to perl5 | perl. + * Corrected preinst so it doesn't fail if not already installed (closes: + #47021, #47531) + * Use x-windows-manager alternatives system (closes: #40733) + * Corrected repeated sentence in fvwm2.1 (closes: #42638) + * Corrected system.warnings reference to README.Debian_upgrading + (closes: #45731) + * Allow .fvwm2/.fvwm warnings to be disabled (closes: #48013) + * FHS compliance + + -- Julian Gilbey Wed, 27 Oct 1999 23:35:41 +0100 + +fvwm (2.2.2-2) unstable; urgency=low + + * Change Pre-Depends: perl to Depends: perl5. + + -- Julian Gilbey Thu, 1 Jul 1999 22:58:21 +0100 + +fvwm (2.2.2-1) unstable; urgency=low + + * Another new upstream bug-fix release + + -- Julian Gilbey Mon, 7 Jun 1999 16:25:34 +0100 + +fvwm (2.2.1-1) unstable; urgency=low + + * New upstream source (bug fixes) + * Never released (not checked for compilability etc) + + -- Julian Gilbey Fri, 14 May 1999 02:13:12 +0100 + +fvwm (2.2-6) unstable; urgency=low + + * Hopefully last release of 2.2 before moving to 2.2.1 (a bug-fix + release) + * Add a new hook to system.fvwm2rc called default-style.hook, so that + all of the icon settings and suchlike don't need to be reset + * Modified system.warnings to provide a restart option on the quit form + * Added example: default-style-hook.change-colours to show how to do so + * Added example: post-hook.change-buttons to reproduce the behaviour of + 2.2-3's title bar buttons + * Added example: post-hook.window-buttons-maximize + * Added example: post-hook.menu-form-exit to use QuitVerify + * Moved default xterm in system.fvwm2rc to top of menu (suggested by + Andrew Pimlott) + * Only have default xterm in main menu if the menu package is not + present (by destroying the menu and re-reading the hook files in the + menu-method) + * Correct icon commands in system.fvwm2rc to refer to programs by + resource class rather than title + * Setup-background has new config file location again and once more can + use sitewide config files (although in a new location); closes: #35634 + again! + * Have postinst for fvwm-common move setup-background's global config + files from /etc/X11/fvwm2 (or their rescued location) to their new + location + + -- Julian Gilbey Fri, 14 May 1999 00:35:29 +0100 + +fvwm (2.2-5) unstable; urgency=low + + * Undo the change to system.fvwm2rc introduced by the fix to #37082 in + 2.2-4. This turned out to make everything far, far too slow. The + code has been relegated to a post.hook example file for those who want + it and are prepared to pay the performance penalty. The problem can + also be `solved' by removing NumLock and ScrollLock's xmodmap + bindings. + + -- Julian Gilbey Tue, 4 May 1999 04:35:52 +0100 + +fvwm (2.2-4) unstable; urgency=low + + * Add MiniIcon style options to system.fvwm2rc for common programs; + closes: #11355, although these will probably need changing when wm- + icons is introduced + * Always have an xterm option on the Debian menu, even if the menu + package is not installed (so won't be stuck with nothing) + * Correction to fvwmrc_convert Sticky* problem + * Wrote setup-background manpage, further alleviating #35634; I think it + can probably be closed soon, once the READMEs are improved; #35706 can + be closed as well + * Correct menu-method (closes: #35829, #36500) + * system.fvwm2rc changes: + - Corrected syntax of Exec commands (to avoid extra shell processes) + - Returned to Exit fvwm menu instead of form (closes: #36232) + - Added MiniIcon options to the Style commands (closes: #11355) + - Adds Alt-Fn to the Window-Ops menu (closes: #32923). I don't really + like the order of options: they make little sense, but the principle + of least surprise requires me to maintain them. I hope to add an + example post.hook in the examples directory to handle this + - Reverted back to Lars' colour scheme (white/steelblue) to please + Branden ;-) (closes: #36231) + - Removed the excess window buttons as well (closes: #36234) + - Handle NumLock and/or ScrollLock being on (closes: #37082) + * Added some example hook files in /usr/doc/fvwm/examples + * Now only Suggests: menu rather than Recommends: (closes: #36335) + * Modify preinst so it only saves modified .hook files (as compared with + the Debian 2.1 (slink) version), saves the whole old /etc/X11/fvwm2 + directory structure too, and only asks the user to hit return to read + the message. This will hopefully be dealt with better at a later + stage. Also rewrote preinst in Perl for the purpose + * Revert to only Recommending fvwm-common rather than Depending + * Removed fvwm-common-beta conflict, as there won't exist such a + package + * Added support for readline and rplay + + -- Julian Gilbey Mon, 3 May 1999 23:50:04 +0100 + +fvwm (2.2-3) unstable; urgency=low + + * Made fvwm Depend on fvwm-common because of setup-background being + called from system.fvwm2rc. Currently an ugly hack, which will + hopefully be cured soon, with fvwm-common being split into wm-common + and wm-icons + * fvwm-common now suggests xloadimage (closes: #35707) + * setup-background is now windows manager independent. However, this + means that its config files have moved. This is documented in the + README file, and will be documented in the manpage to appear + (hopefully) in the next upload -- sort of exacerbates bug #35634 + * fixed debian/rules to handle broken fileutils 4.0 (closes: #35866) - + thanks James for spotting this one! + + -- Julian Gilbey Wed, 14 Apr 1999 22:29:40 +0100 + +fvwm (2.2-2) unstable; urgency=low + + * Corrected semantic error in preinst (closes: #34981) + + -- Julian Gilbey Wed, 24 Mar 1999 14:12:13 +0000 + +fvwm (2.2-1) unstable; urgency=low + + * New upstream (stable!!) source; this is the first stable release of + FVWM 2 + * New maintainer + * MAJOR USER-VISIBLE CHANGES have been made in this package as compared + to the fvwm2 beta-releases. These are mainly due to the fact that + fvwm is now the main package and fvwm1 is secondary: please see the + README.upgrade file for details + * Renamed this package as fvwm on Branden Robinson's advice, as it is + now *the* stable fvwm; FVWM 1.xx has been discontinued upstream (and + FVWM 1.xx is now found in the fvwm1 package) + * Massive changes to the Debian scripts which solve several of the + Debian-related bugs + * Lots of bugs are closed by fixes in the upstream source since the bugs + were filed + * This release closes: #5736, #10862, #11861, #16143, #18576, #20444, + #20831, #22286, #24135, #32796, #32939, #33109, #33755, #34149, + #18003, #21097, #32795, #8785, #8954, #14791, 21547, #25601, #11495, + #27276, although some of these are not really fixed, but the upstream + authors do not intend to do so in the near future. Also, the + following bugs are partially fixed: 11824 and 11886. + + -- Julian Gilbey Fri, 19 Mar 1999 00:18:21 +0000 + +fvwm2 (2.1.10-2) unstable; urgency=low + + * Get the --syscondir= option right (closes: #32775). + * Add setup-background (closes: #32777). + * Fixup postinst (closes: #32779). + + -- Vincent Renardias Wed, 3 Feb 1999 09:15:02 +0100 + +fvwm2 (2.1.10-1) unstable; urgency=low, closes=31800 30418 25943 31204 8665 16949 26671 21314 30216 10099 11899 25939 26316 30506 13008 12985 13146 14236 17667 24310 17668 22844 22982 25770 25941 25942 27851 31439 17972 26748 + + * New upstream release (Bugs #31800, #30418, #25943) + (Upstream version changed a _lot_ of code, so I had to + shoehorn the previous changes; Hope I got it right.) + * changes to debian/rules: + - adapt for GNU configure. + - Fvwm.tmpl doesn't exist anymore. + - strip executables (Pkg size: 2.4Mo -> 700k) + * Now includes FvwmCommand/FvwmCommandS (Bug #31204). + * extras/* modules included (Bugs #8665, #16949). + * Removed Recommends: from package fvwm-common on fvwm2|fvwm95: + It's not up to fvwm-common to recommend a WM, but to the WMs + which are using it to recommend fvwm-common. + Fix bug #26671. + * Move setup-background from fvwm2 to fvwm-common (Bug #21314). + * Patch setup-background so it works with other window managers + too (Bug #30216). + * The default config and the menu system are now decent enough + to consider #10099 fixed. + * #10862 has been fixed in upstream code. + * Don't autoconvert the users' .fvwmrc anymore + (Bugs #11899, #25939, #26316, #30506). + * Close #13008 & #12985: This was very likely due to a file + corruption that happened during download, or the file was already + corrupted/truncated on the mirror were it has been fetched. + * Close #13146: This is not a bug, but the expected behavior. + * Close #14236: The behavior has changed upstream. + * s/DestroyMenu/DestroyFunc/ in system.fvwm2rc + (Bugs #17667, #24310). + * Set 'Mouse 0 W M -' in system.fvwm2rc (Bug #17668). + * Fix #22844 (NMU Hack). Could not re-apply the patch since + the build system has moved to autoconf. + * s/README.sysrc/README.sysrc.gz/ in system.fvwm2rc + (Bug #22982). + * Close #25770, #25941, #25942 (the fvwm2-plus package isn't produced anymore). + * Set PagerGeometry to '-0-0' (Bug #27851). + * Now built with rplay support (Bug #31439). + * Don't Recommends: menu, just Suggests: it (Bug #17972). + * Add Y. Dirson's suggestion to system.fvwm2rc (Bug #26748). + * post{inst,rm} scripts now use the register-window-manager + script. + + -- Vincent Renardias Fri, 29 Jan 1999 22:11:01 +0100 + +fvwm2 (2.0.46-BETA-3.1) frozen unstable; urgency=low + + * Corrected Fvwm.tmpl to look for AlphaArchitecture && __linux__ + instead of just linux. This seems to work again. + + -- Michael Alan Dorman Sun, 10 May 1998 19:49:03 +0500 + +fvwm2 (2.0.46-BETA-3) frozen unstable; urgency=low + + * postinst: create /etc/X11/window-managers if it doesn't already exist + as temporary work-around for case when xbase hasn't been configured + by the time fvwm2 postinst runs. Fixes Bug#22022. + * copyright file now included in fvwm-common. Fixed Bug#19312. + * system.fvwm2rc now includes ScrollBar line in window-ops menu, + fixing Bug#21559. + * system.fvwm2rc has fixed M-TAB and friends. Single page only, + however, due to bug in page flipping. Fixes Bug#17666. + + -- Austin Donnelly Sat, 2 May 1998 19:49:03 +0100 + +fvwm2 (2.0.46-BETA-2) unstable; urgency=low + + * removed mini-gv.xpm from fvwm-common icons, since it was causing an + overlap with the gv package. Fixes Bug#16373. + + -- Austin Donnelly Sat, 24 Jan 1998 12:58:46 +0000 + +fvwm2 (2.0.46-BETA-1) unstable; urgency=low + + * moved to newest upstream version, 2.0.46 + * built against libc6 and newest X libraries. Fixes Bugs 11683, 12674, + 12970, 11682, 12676, 12921, 12967 and 13577. (Yes, really!) + * patch to FvwmPager fixes problems with geometry spec overriding. + Fixes Bugs 10330, 10535, 11051 and 11860. + * new upstream release fixes Bug#11489: NoTitle and MiniIcon bad interaction. + * FvwmIdent manpage fix: default background is white. Fixes Bug#11495. + * incorporated RJK's fixes to fvwmrc_convert (as reported in Bug#10138). + * fvwmrc_convert doesn't use gawk anymore. Fixes Bug#10140. + * postinst and postrm add and remove fvwm2 from /etc/X11/window-managers. + Fixes Bug#11484. + * FvwmCpp now uses /lib/cpp for its cpp. Fixes Bug#11051. + * explicitly set PixmapPath and IconPath in Fvwm.tmpl since the imake + defaults are no longer any good. + * README.sysrc includes "hints and tips" section, with info on + configuring your pager. + + -- Austin Donnelly Sun, 5 Oct 1997 13:55:32 +0100 + +fvwm2 (2.0.45-BETA-4) unstable; urgency=high + + * manpage fix: OpaqueMove -> OpaqueMoveSize (Fixes Bug#8775). + * manpage fix: say that fvwm2 reads /etc/X11/fvwm2/system.fvwm2rc + Fixes Bug#8767. + * move subdirectories of debian/ into a tar.gz.uue file. + Fixes Bug#8664 and Bug#9141. + * changelog.Debian (this file) now distributed. Fixes Bug#8637. + * move hook files aside in preinst so dpkg doesn't blow them away when + they leave the file list. Restore or default them in the postinst. + * /etc/menu-methods/fvwm2 now puts quotes around titles to xterms for + text-only menu entries. + * remove the "DeleteMenu" from /etc/menu-methods/fvwm2, and don't + generate main-menu.hook. + * main-menu-pre.hook now available again + * system.fvwm2rc modified to use main-menu-pre.hook + * sloppy arg checking in postinst made fvwm2 impossible to install from + scratch - this is why this is urgency HIGH. + * fvwm2-menu-method upgraded to menu-1.3 compatible one + * fvwm2-menudefs upgraded to menu-1.3 compatability + * fvwm2 now "recommends" menu(>=1.3). + * default main-menu-pre.hook is an xterm entry, just in case menu is + not being used. + * system.fvwm2rc now decor-friendly + * include sample fvwm2rc showing how to use M4 + * when purging, clear out /etc/X11/fvwm2/.fvwm too + + -- Austin Donnelly Thu, 8 May 1997 00:42:19 +0100 + +fvwm2 (2.0.45-BETA-3) unstable; urgency=low + + * Changed package description to be more up-to-date + * postinst now cleans up the no longer used main-menu-pre.hook, and + resets main-menu.hook (vestige of the old menu system). + Fixes Bug#8318. + + -- Austin Donnelly Sun, 6 Apr 1997 16:58:57 +0100 + +fvwm2 (2.0.45-BETA-2) unstable; urgency=low + + * Use Joost's menu package more correctly + * Add list of modules we support to Modules/ menu (Fixes Bug#8066). + * Spruce up the system.fvwm2rc a little: its now much more usable. Fixes + Bug#8044, and should go some way to fixing Bug#8174. + * README.sysrc updated to reflect new world view. + * Moved bitmaps out of /usr/include/X11/pixmaps. Fixes Bug#7625. + + -- Austin Donnelly Sun, 23 Mar 1997 19:22:07 +0000 + +fvwm2 (2.0.45-BETA-1) unstable; urgency=medium + + * Don't overwrite the default hooks. Fixes Bug#7364. + * Applied Andrew Veliath's patch to fix the "Style ... NoButton 0" + bugglet (bug in upstream 2.0.45). + * Added support for Joost's menu system + * Added upstream ChangeLog to /usr/doc/fvwm2. Fixes Bug#7305. + + -- Austin Donnelly Sat, 15 Feb 1997 16:42:23 +0000 + + +fvwm2 (2.0.45-BETA-0) unstable; urgency=low + + * New upstream source: fvwm v2.0.45 from + ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/fvwm-2.0.45.tar.gz + * Fixed typo in FvwmWinList manpage (Fixes Bug#6408). + * New release fixes wrong gid problems (Bug#6469, Bug#6924, Bug#6925) + * Install a stripped xpmroot binary (Fixes Bug#5072) + * Tweak to system.fvwm2rc to solve problem with hooks being run + multiple times. (Fixes Bug#6597). + * Now includes some icons from fvwm95 - related to Bug#6401 in fvwm95 + * Include my own fvwm2rc to demo new features of fvwm2 + + -- Austin Donnelly Sun, 9 Feb 1997 17:45:42 +0000 + + +fvwm2 (2.0.44-BETA-0) unstable; urgency=low + + * New upstream source: fvwm v2.0.44 from + ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/fvwm-2.0.44.tar.gz + * Re-packaged in new Debian source format + * NEVER RELEASED into the wild. + + -- Austin Donnelly Sat, 11 Jan 1997 19:06:24 +0000 + + + +Sun Aug 25 15:21:42 1996 Austin Donnelly + + * debian.rules: added GoodStuff manpage to fvwm-common package. + + * icons/xterm-linux.xpm: added from kernel source + + * manpages: are now installed compressed + + * Released version 2.0.43 + +Sat Aug 17 15:49:39 1996 Austin Donnelly + + * fvwm2.man: typo fixed. Bug#4099. + +Sun Jul 28 21:20:11 1996 Austin Donnelly + + * New upstream version, 2.0.43 + + * debian.rules: conforms to new packaging guidelines + + * added Lars Wirzenius' dynamic fvwm config stuff as default + + * split off common parts into new fvwm-common package. This source + tree now build both the fvwm2 and fvwm-common packages. Fixes + bugs #3437 and #3748. + + * renamed system configuration file to system.fvwm2rc. Tickles a + bug in dpkg. + + * Added complex example configuration file, to show off lots more + features. + + * debian.postinst: creates empty hook files to shut fvwm up + + * debian.postrm: remove empty hook files on purge + + +Sat Apr 20 21:06:03 1996 Austin Donnelly + + * Fvwm.tmpl: define FVWM_CPP to be /lib/cpp + + * added debian.* files + + * added utils/convert_users to be called from postinst + + * fvwm2.man: man page corrections + + * mini.emacs.xpm: emacs icon drawn and added + + * FvwmAuto.man: more corrections + + * FvwmCpp.c: security fix + + * FvwmCpp.man: corrections + + * FvwmM4.c: security fix + + * FvwmPager.man: correction + + * fvwmrc_convert: bugfixes: + o corrects order of IconBox translation + o if old .fvwmrc specified to use the built-in pager, then + configure FvwmPager to be as similar as possible + o fixes problem with old buttonstyle translation conde + o fixed problem where spurious ')' could appear at the start + of a line by itself + o handles MWMBorders + o handles Cursor + o handles SloppyFocus + o fixes a few problems with '$0' appearing in output rather than + being expanded. + o fixes problems translating menu defns with spaces in the title + + +Wed Apr 17 16:27:12 1996 Austin Donnelly + + * Got source from: + ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/fvwm-2.0.42.tar.gz --- fvwm-2.5.27.ds.orig/debian/postrm +++ fvwm-2.5.27.ds/debian/postrm @@ -0,0 +1,188 @@ +#! /bin/sh +# -*- Mode: Sh -*- +# postrm --- +# Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +# Created On : Fri Nov 14 12:22:20 2003 +# Created On Node : glaurung.green-gryphon.com +# Last Modified By : Manoj Srivastava +# Last Modified On : Thu Mar 17 18:31:55 2005 +# Last Machine Used: glaurung.internal.golden-gryphon.com +# Update Count : 19 +# Status : Unknown, Use with caution! +# HISTORY : +# Description : +# +# arch-tag: 56802d51-d980-4822-85c0-28fce19ed430 +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + + +# Abort if any command returns an error value +set -e + +package_name=fvwm + +if [ -z "$package_name" ]; then + print >&2 "Internal Error. Please report a bug." + exit 1; +fi + +# This script is called twice during the removal of the package; once +# after the removal of the package's files from the system, and as +# the final step in the removal of this package, after the package's +# conffiles have been removed. +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# Ensure the menu system is updated +[ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus + +case "$1" in + remove) + # This package is being removed, but its configuration has not yet + # been purged. + : + # Deprecated + # if test -x /usr/sbin/wm-menu-config; then wm-menu-config fvwm off; fi + + if [ -e /etc/menu-methods/fvwm ] && [ ! -x /etc/menu-methods/fvwm ]; then + chmod a-x /etc/menu-methods/fvwm + fi + [ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus + + + # Remove diversion + ##: dpkg-divert --package ${package_name} --remove --rename \ + ##: --divert /usr/bin/other.real /usr/bin/other + + # ldconfig is NOT needed during removal of a library, only during + # installation + + ;; + purge) + # This package has previously been removed and is now having + # its configuration purged from the system. + + #remove the files that install-menu creates: + # (cd /etc/X11/fvwm/; rm system.twmrc menus.dat menudefs.hook) + + + # we mimic dpkg as closely as possible, so we remove configuration + # files with dpkg backup extensions too: + ### Some of the following is from Tore Anderson: + for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do + for i in DebianMenu system.fvwm2rc init-restart.hook menudefs.hook; do + rm -f /etc/X11/${package_name}/${i}$ext + done + done + + # remove the configuration file itself + for i in system.fvwm2rc init-restart.hook menudefs.hook; do + if [ -e /etc/X11/fvwm/$i ]; then + rm -f /etc/X11/fvwm/$i + fi + done + + # and finally clear it out from the ucf database + ##: ucf --purge /etc/${package_name}.conf + + # Remove symlinks from /etc/rc?.d + ##: update-rc.d ${package_name} remove >/dev/null + + ##: if [ -e /usr/share/debconf/confmodule ]; then + ##: # Purge this package's data from the debconf database. + ##: . /usr/share/debconf/confmodule + ##: db_purge + ##: fi + + # This package has previously been removed and is now having + # its configuration purged from the system. + ##: for flavour in emacs20 emacs21; do + ##: STARTDIR=/etc/$flavour/site-start.d; + ##: STARTFILE="${package_name}-init.el"; + ##: if [ -e "$STARTDIR/20$STARTFILE" ]; then + ##: rm -f "$STARTDIR/20$STARTFILE" + ##: fi + ##: done + + ;; + disappear) + if test "$2" != overwriter; then + echo "$0: undocumented call to \`postrm $*'" 1>&2 + exit 0 + fi + # This package has been completely overwritten by package $3 + # (version $4). All our files are already gone from the system. + # This is a special case: neither "prerm remove" nor "postrm remove" + # have been called, because dpkg didn't know that this package would + # disappear until this stage. + : + + ;; + upgrade) + # About to upgrade FROM THIS VERSION to version $2 of this package. + # "prerm upgrade" has been called for this version, and "preinst + # upgrade" has been called for the new version. Last chance to + # clean up. + : + + ;; + failed-upgrade) + # About to upgrade from version $2 of this package TO THIS VERSION. + # "prerm upgrade" has been called for the old version, and "preinst + # upgrade" has been called for this version. This is only used if + # the previous version's "postrm upgrade" couldn't handle it and + # returned non-zero. (Fix old postrm bugs here.) + : + + ;; + abort-install) + # Back out of an attempt to install this package. Undo the effects of + # "preinst install...". There are two sub-cases. + : + + if test "${2+set}" = set; then + # When the install was attempted, version $2's configuration + # files were still on the system. Undo the effects of "preinst + # install $2". + : + + else + # We were being installed from scratch. Undo the effects of + # "preinst install". + : + + fi ;; + abort-upgrade) + # Back out of an attempt to upgrade this package from version $2 + # TO THIS VERSION. Undo the effects of "preinst upgrade $2". + : + + ;; + *) echo "$0: didn't understand being called with \`$1'" 1>&2 + exit 0;; +esac + +exit 0 --- fvwm-2.5.27.ds.orig/debian/conffiles +++ fvwm-2.5.27.ds/debian/conffiles @@ -0,0 +1 @@ +/etc/menu-methods/fvwm --- fvwm-2.5.27.ds.orig/debian/NEWS.Debian +++ fvwm-2.5.27.ds/debian/NEWS.Debian @@ -0,0 +1,54 @@ +fvwm (2.5.10-6) unstable; urgency=low + + Previous versions of the FVWM package provided a Debian-specific default + configuration setup which was suboptimal in some respects. Starting with + 2.5.10, the Debian packages rely on FVWM's own default configuration + mechanisms. Thus, if you start without a ~/.fvwm/ directory and no + ~/.fvwm2rc file, FVWM will provide a menu that sets up a basic + configuration for you. + + If you are upgrading from a previous version of the FVWM package and you + would like to populate your home directory with the old Debian-specific + default configuration, you may be able to do so by using the following + commands: + mkdir ~/.fvwm + for i in /etc/X11/fvwm/*.hook.dpkg-old; do + cp "$i" "~/.fvwm/$(basename "$i" .dpkg-old)" + done + + Even though it's possible for you to use the old Debian-specific + configuration files, this is not recommended. Aside from FVWM's own + default configuration, this Debian package includes a full set of examples + in /usr/share/doc/fvwm/sample.fvwmrc/, and http://www.fvwm.org/ has many + additional resources. + + -- Manoj Srivastava Fri, 7 May 2004 00:59:50 -0500 + +fvwm (2.5.8-0.3) experimental; urgency=low + + * There are new conditions, conditional statements, styles, commands, + command options, transparency support, EWMH support (allows + integration into KDE and GNOME environments), finer grained + customization of decorations, themes support, finer grained binding of + commands to portions of the window border, anti-aliased text rendering + support, embedded perl library for creating modules in Perl, better + placement algorithms, improved performance, new graphical debugger + module, and many other changes. + * There are new utilities to help customize fvwm if there is no fvwmrc + file available. Because of this, the package removes the default + system-wide fvwmrc file, since that shadowed the nice configuration + utilities. + * The Debian menu is available from the file /etc/X11/fvwm/DebianMenu + (the old file /etc/X11/fvwm/menudefs.hook shall be retained as a + synlink for a bit). This would require a change in existing user + configuration files. + * In the postinst we now move old conffiles out of the way (.dpkg-old), + since they interfere with the new configuration generation tools; but + we do not delete the files, so preserving user changes. We only do + this if the user is upgrading from a pre 2.5.8 version. On purge, we + remove all these preserved files as well. + * As a passing note, this package under the control of arch + arch-tag: ec98d578-705b-4b9e-80bb-4d998c2d377c + + + -- Manoj Srivastava Wed, 26 Nov 2003 09:41:16 -0600 --- fvwm-2.5.27.ds.orig/debian/common/pkgvars.mk +++ fvwm-2.5.27.ds/debian/common/pkgvars.mk @@ -0,0 +1,99 @@ +############################ -*- Mode: Makefile -*- ########################### +## pkgvars.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Sat Nov 15 02:56:30 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Thu Jun 15 12:05:46 2006 +## Last Machine Used: glaurung.internal.golden-gryphon.com +## Update Count : 11 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : This is what allows us toseparate out the top level +## targets, by determining which packages needto be built. +## +## arch-tag: 75fcc720-7389-4eaa-a7ac-c556d3eac331 +## +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## 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, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## +############################################################################### + +# The maintainer information. +maintainer := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Maintainer: | \ + sed 's/^Maintainer: *//') +email := srivasta@debian.org + +# Priority of this version (or urgency, as dchanges would call it) +urgency := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Urgency: | \ + sed 's/^Urgency: *//') + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | \ + cut -f 2 -d ':')) +DEB_VERSION := $(strip $(shell LC_ALL=C dpkg-parsechangelog | \ + egrep '^Version:' | cut -f 2 -d ' ')) +DEB_ISNATIVE := $(strip $(shell LC_ALL=C dpkg-parsechangelog | \ + perl -ne 'print if (m/^Version:/g && ! m/^Version:.*\-/);')) +DEB_DISTRIBUTION := $(strip $(shell LC_ALL=C dpkg-parsechangelog | \ + egrep '^Distribution:' | cut -f 2 -d ' ')) + +DEB_PACKAGES := $(shell perl -e ' \ + $$/=""; \ + while(<>){ \ + $$p=$$1 if m/^Package:\s*(\S+)/; \ + die "duplicate package $$p" if $$seen{$$p}; \ + $$seen{$$p}++; print "$$p " if $$p; \ + }' debian/control ) + +DEB_INDEP_PACKAGES := $(shell perl -e ' \ + $$/=""; \ + while(<>){ \ + $$p=$$1 if m/^Package:\s*(\S+)/; \ + die "duplicate package $$p" if $$seen{$$p}; \ + $$seen{$$p}++; \ + $$a=$$1 if m/^Architecture:\s*(\S+)/m; \ + next unless ($$a eq "all"); \ + print "$$p " if $$p; \ + }' debian/control ) + +DEB_ARCH_PACKAGES := $(shell perl -e ' \ + $$/=""; \ + while(<>){ \ + $$p=$$1 if m/^Package:\s*(\S+)/; \ + die "duplicate package $$p" if $$seen{$$p}; \ + $$seen{$$p}++; \ + $$c=""; \ + if (/^Architecture:\s*(.*?)\s*$$/sm) { \ + @a = split /\s+/, $$1 }; \ + for my $$b (@a) { \ + next unless ($$b eq "$(DEB_HOST_ARCH)" || \ + $$b eq "any"); \ + $$c="$$p"; \ + } \ + print "$$c " if $$c; \ + }' debian/control ) + +# This package is what we get after removing the psuedo dirs we use in rules +package = $(notdir $@) + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +#Local variables: +#mode: makefile +#End: --- fvwm-2.5.27.ds.orig/debian/common/targets.dot +++ fvwm-2.5.27.ds/debian/common/targets.dot @@ -0,0 +1,293 @@ +strict digraph Targets { + //ranksep=0.750; + //nodesep=0.500; + + // Nodes attributes: filled == Double-colon targt (most work is done here) + // Oval == Target based on a time stamp + // Octagon == Phony target + // Double lines denote a mandatory target (periperies=2) + + // Edge attributes: Dotted line indicates the target is called using $(MAKE) + + "debian/stamp/dummy-config-common" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-config-common" [ style="filled", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-config-common" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-config-arch" [ style="filled", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-config-arch" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-config-indep" [ style="filled", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-config-indep" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/CONFIG/foo-arch" [ style="filled", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/CONFIG/bar-indep" [ style="filled", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-configure-arch" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-configure-indep" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-configure-arch" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-configure-indep" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10] + "configure-arch" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "configure-indep" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "configure" [ style="bold", color="#DEE3FF", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + + "debian/stamp/pre-build-common" [ style="filled", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-build-arch" [ style="filled", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-build-arch" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-build-indep" [ style="filled", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-build-indep" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/BUILD/foo-arch" [ style="filled", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/BUILD/bar-indep" [ style="filled", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-build-arch" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-build-indep" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-build-arch" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-build-indep" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "build-arch" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10, shape="octagon", peripheries=2] + "build-indep" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10, shape="octagon", peripheries=2] + "build" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10, shape="octagon", peripheries=2] + "debian/stamp/post-build-arch" [ style="filled", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/post-build-indep" [ style="filled", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-post-build-arch" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-post-build-indep" [ style="bold", color="#74A5ED", fontcolor="NavyBlue", fontsize=10] + + "debian/stamp/pre-inst-common" [ style="filled", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-inst-arch" [ style="filled", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-inst-arch" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-inst-indep" [ style="filled", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-inst-indep" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/INST/foo-arch" [ style="filled", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/INST/bar-indep" [ style="filled", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-install-arch" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-install-indep" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-install-arch" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-install-indep" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10] + "install-arch" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "install-indep" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "install" [ style="bold", color="#F8DFDB", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + + "debian/stamp/pre-bin-common" [ style="filled", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-bin-arch" [ style="filled", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-bin-arch" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/pre-bin-indep" [ style="filled", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-pre-bin-indep" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/BIN/foo-arch" [ style="filled", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/BIN/bar-indep" [ style="filled", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-binary-arch" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/dep-binary-indep" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-binary-arch" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "debian/stamp/do-binary-indep" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10] + "binary-arch" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10, shape="octagon", peripheries=2] + "binary-indep" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10, shape="octagon", peripheries=2] + "binary" [ style="bold", color="#CEFFC0", fontcolor="NavyBlue", fontsize=10, shape="octagon", peripheries=2] + + + "CLN-common" [ style="filled" , color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "CLN-arch" [ style="filled" , color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "CLN-indep" [ style="filled" , color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "CLEAN/foo-arch" [ style="filled" , color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "CLEAN/bar-indep" [ style="filled" , color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "clean-arch" [ style="bold", color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "clean-indep" [ style="bold", color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon"] + "clean" [ style="bold", color="#E2E8C3", fontcolor="NavyBlue", fontsize=10, shape="octagon", peripheries=2] + + + "CLN-common" -> "CLN-arch" [dir=back] + "CLN-common" -> "CLN-indep" [dir=back] + "CLN-arch" -> "CLEAN/foo-arch" [dir=back] + "CLN-indep" -> "CLEAN/bar-indep" [dir=back] + "CLN-arch" -> "clean-arch" [dir=back] + "CLEAN/foo-arch" -> "clean-arch" [dir=back] + "CLN-indep" -> "clean-indep" [dir=back] + "CLEAN/bar-indep" -> "clean-indep" [dir=back] + "clean-indep" -> "clean" [dir=back] + "clean-arch" -> "clean" [dir=back] + +// "debian/stamp/dummy-config-common" -> "debian/stamp/pre-config-common" [dir=back] + "debian/stamp/dummy-config-common" -> "debian/stamp/do-pre-config-common" [dir=back] + "debian/stamp/pre-config-common" -> "debian/stamp/do-pre-config-common" [dir=back color="Red"] +// "CUSTOM-1" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-1" -> "debian/stamp/pre-config-common" [dir=back] +// "debian/stamp/do-pre-config-common" -> "debian/stamp/pre-config-arch" [dir=back] + "debian/stamp/do-pre-config-common" -> "debian/stamp/do-pre-config-arch" [dir=back] + "debian/stamp/pre-config-arch" -> "debian/stamp/do-pre-config-arch" [dir=back color="Red"] +// "CUSTOM-2" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-2" -> "debian/stamp/pre-config-arch" [dir=back] +// "debian/stamp/do-pre-config-common" -> "debian/stamp/pre-config-indep" [dir=back] + "debian/stamp/do-pre-config-common" -> "debian/stamp/do-pre-config-indep" [dir=back] + "debian/stamp/pre-config-indep" -> "debian/stamp/do-pre-config-indep" [dir=back color="Red"] +// "CUSTOM-3" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-3" -> "debian/stamp/pre-config-indep" [dir=back] +// "debian/stamp/do-pre-config-arch" -> "debian/stamp/CONFIG/foo-arch" [dir=back] +// "debian/stamp/do-pre-config-indep" -> "debian/stamp/CONFIG/bar-indep" [dir=back] +// "debian/stamp/do-pre-config-arch" -> "debian/stamp/dep-configure-arch" [dir=back] + "debian/stamp/CONFIG/foo-arch" -> "debian/stamp/dep-configure-arch" [dir=back] +// "debian/stamp/do-pre-config-indep" -> "debian/stamp/dep-configure-indep" [dir=back] + "debian/stamp/CONFIG/bar-indep" -> "debian/stamp/dep-configure-indep" [dir=back] + + "debian/stamp/do-pre-config-arch" -> "debian/stamp/do-configure-arch" [dir=back] + "debian/stamp/dep-configure-arch" -> "debian/stamp/do-configure-arch" [dir=back color="Red"] +// "CUSTOM-4" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-4" -> "debian/stamp/CONFIG/foo-arch" [dir=back] + "debian/stamp/do-pre-config-indep" -> "debian/stamp/do-configure-indep" [dir=back] + "debian/stamp/dep-configure-indep" -> "debian/stamp/do-configure-indep" [dir=back color="Red"] +// "CUSTOM-5" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-5" -> "debian/stamp/CONFIG/bar-indep" [dir=back] + "debian/stamp/do-configure-arch" -> "configure-arch" [dir=back] + "debian/stamp/do-configure-indep" -> "configure-indep" [dir=back] + "debian/stamp/do-configure-arch" -> "configure" [dir=back] + "debian/stamp/do-configure-indep" -> "configure" [dir=back] + +// "debian/stamp/do-configure-arch" -> "debian/stamp/pre-build-arch" [dir=back] + "debian/stamp/do-configure-arch" -> "debian/stamp/do-pre-build-arch" [dir=back] + "debian/stamp/pre-build-common" -> "debian/stamp/do-pre-build-arch" [dir=back color="Red"] +// "CUSTOM-6" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-6" -> "debian/stamp/pre-build-common" [dir=back] + "debian/stamp/pre-build-arch" -> "debian/stamp/do-pre-build-arch" [dir=back color="Red"] +// "CUSTOM-7" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-7" -> "debian/stamp/pre-build-arch" [dir=back] + "debian/stamp/pre-build-common" -> "debian/stamp/do-pre-build-indep" [dir=back color="Red"] + "debian/stamp/do-configure-indep" -> "debian/stamp/do-pre-build-indep" [dir=back] +// "debian/stamp/do-configure-indep" -> "debian/stamp/pre-build-indep" [dir=back] + "debian/stamp/pre-build-indep" -> "debian/stamp/do-pre-build-indep" [dir=back color="Red"] +// "CUSTOM-8" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-8" -> "debian/stamp/pre-build-indep" [dir=back] +// "debian/stamp/do-pre-build-arch" -> "debian/stamp/BUILD/foo-arch" [dir=back] +// "debian/stamp/do-pre-build-indep" -> "debian/stamp/BUILD/bar-indep" [dir=back] +// "debian/stamp/do-pre-build-arch" -> "debian/stamp/dep-build-arch" [dir=back] + "debian/stamp/BUILD/foo-arch" -> "debian/stamp/dep-build-arch" [dir=back] +// "debian/stamp/do-pre-build-indep" -> "debian/stamp/dep-build-indep" [dir=back] + "debian/stamp/BUILD/bar-indep" -> "debian/stamp/dep-build-indep" [dir=back] + "debian/stamp/do-pre-build-arch" -> "debian/stamp/do-build-arch" [dir=back] + "debian/stamp/dep-build-arch" -> "debian/stamp/do-build-arch" [dir=back color="Red"] +// "CUSTOM-9" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-9" -> "debian/stamp/BUILD/foo-arch" [dir=back] + "debian/stamp/do-pre-build-indep" -> "debian/stamp/do-build-indep" [dir=back] + "debian/stamp/dep-build-indep" -> "debian/stamp/do-build-indep" [dir=back color="Red"] +// "CUSTOM-10" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-10" -> "debian/stamp/BUILD/bar-indep" [dir=back] + "debian/stamp/do-build-arch" -> "build-arch" [dir=back] + "debian/stamp/do-build-indep" -> "build-indep" [dir=back] + "debian/stamp/do-build-arch" -> "build" [dir=back] + "debian/stamp/do-build-indep" -> "build" [dir=back] +// "debian/stamp/do-build-arch" -> "debian/stamp/post-build-arch" [dir=back] + "debian/stamp/do-build-arch" -> "debian/stamp/do-post-build-arch" [dir=back] + "debian/stamp/do-build-indep" -> "debian/stamp/do-post-build-indep" [dir=back] + "debian/stamp/post-build-arch" -> "debian/stamp/do-post-build-arch" [dir=back color="Red"] +// "CUSTOM-11" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-11" -> "debian/stamp/post-build-arch" [dir=back] + "debian/stamp/post-build-indep" -> "debian/stamp/do-post-build-indep" [dir=back color="Red"] +// "CUSTOM-12" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-12" -> "debian/stamp/post-build-indep" [dir=back] +// "debian/stamp/do-post-build-arch" -> "debian/stamp/pre-inst-arch" [dir=back] + "debian/stamp/pre-inst-common" -> "debian/stamp/do-pre-inst-arch" [dir=back color="Red"] +// "CUSTOM-13" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-13" -> "debian/stamp/pre-inst-common" [dir=back] + "debian/stamp/do-post-build-arch" -> "debian/stamp/do-pre-inst-arch" [dir=back] + "debian/stamp/pre-inst-arch" -> "debian/stamp/do-pre-inst-arch" [dir=back color="Red"] +// "CUSTOM-14" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-14" -> "debian/stamp/pre-inst-arch" [dir=back] +// "debian/stamp/do-post-build-indep" -> "debian/stamp/pre-inst-indep" [dir=back] + "debian/stamp/pre-inst-common" -> "debian/stamp/do-pre-inst-indep" [dir=back color="Red"] + "debian/stamp/do-post-build-indep" -> "debian/stamp/do-pre-inst-indep" [dir=back] + "debian/stamp/pre-inst-indep" -> "debian/stamp/do-pre-inst-indep" [dir=back color="Red"] +// "CUSTOM-15" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-15" -> "debian/stamp/pre-inst-indep" [dir=back] +// "debian/stamp/do-pre-inst-arch" -> "debian/stamp/INST/foo-arch" [dir=back] +// "debian/stamp/do-pre-inst-indep" -> "debian/stamp/INST/bar-indep" [dir=back] +// "debian/stamp/do-pre-inst-arch" -> "debian/stamp/dep-install-arch" [dir=back] + "debian/stamp/INST/foo-arch" -> "debian/stamp/dep-install-arch" [dir=back] +// "debian/stamp/do-pre-inst-indep" -> "debian/stamp/dep-install-indep" [dir=back] + "debian/stamp/INST/bar-indep" -> "debian/stamp/dep-install-indep" [dir=back] + "debian/stamp/do-pre-inst-arch" -> "debian/stamp/do-install-arch" [dir=back] + "debian/stamp/dep-install-arch" -> "debian/stamp/do-install-arch" [dir=back color="Red"] +// "CUSTOM-16" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-16" -> "debian/stamp/INST/foo-arch" [dir=back] + "debian/stamp/do-pre-inst-indep" -> "debian/stamp/do-install-indep" [dir=back] + "debian/stamp/dep-install-indep" -> "debian/stamp/do-install-indep" [dir=back color="Red"] +// "CUSTOM-17" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-17" -> "debian/stamp/INST/bar-indep" [dir=back] + "debian/stamp/do-install-arch" -> "install-arch" [dir=back] + "debian/stamp/do-install-indep" -> "install-indep" [dir=back] + "debian/stamp/do-install-arch" -> "install" [dir=back] + "debian/stamp/do-install-indep" -> "install" [dir=back] +// "debian/stamp/do-install-arch" -> "debian/stamp/pre-bin-arch" [dir=back] + "debian/stamp/do-install-arch" -> "debian/stamp/do-pre-bin-arch" [dir=back] + "debian/stamp/pre-bin-common" -> "debian/stamp/do-pre-bin-arch" [dir=back color="Red"] +// "CUSTOM-18" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-18" -> "debian/stamp/pre-bin-common" [dir=back] + "debian/stamp/pre-bin-arch" -> "debian/stamp/do-pre-bin-arch" [dir=back color="Red"] +// "CUSTOM-19" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-19" -> "debian/stamp/pre-bin-arch" [dir=back] +// "debian/stamp/do-install-indep" -> "debian/stamp/pre-bin-indep" [dir=back] + "debian/stamp/pre-bin-common" -> "debian/stamp/do-pre-bin-indep" [dir=back color="Red"] + "debian/stamp/do-install-indep" -> "debian/stamp/do-pre-bin-indep" [dir=back] + "debian/stamp/pre-bin-indep" -> "debian/stamp/do-pre-bin-indep" [dir=back color="Red"] +// "CUSTOM-20" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-20" -> "debian/stamp/pre-bin-indep" [dir=back] +// "debian/stamp/do-pre-bin-arch" -> "debian/stamp/BIN/foo-arch" [dir=back] +// "debian/stamp/do-pre-bin-indep" -> "debian/stamp/BIN/bar-indep" [dir=back] +// "debian/stamp/pre-bin-arch" -> "debian/stamp/dep-binary-arch" [dir=back] + "debian/stamp/BIN/foo-arch" -> "debian/stamp/dep-binary-arch" [dir=back] +// "debian/stamp/do-pre-bin-indep" -> "debian/stamp/dep-binary-indep" [dir=back] + "debian/stamp/BIN/bar-indep" -> "debian/stamp/dep-binary-indep" [dir=back] + "debian/stamp/do-pre-bin-arch" -> "debian/stamp/do-binary-arch" [dir=back] + "debian/stamp/dep-binary-arch" -> "debian/stamp/do-binary-arch" [dir=back color="Red"] +// "CUSTOM-21" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-21" -> "debian/stamp/BIN/foo-arch" [dir=back] + "debian/stamp/do-pre-bin-indep" -> "debian/stamp/do-binary-indep" [dir=back] + "debian/stamp/dep-binary-indep" -> "debian/stamp/do-binary-indep" [dir=back color="Red"] +// "CUSTOM-22" [ style="filled", color="#FFE4B5", fontcolor="NavyBlue", fontsize=10, shape="diamond"] +// "CUSTOM-22" -> "debian/stamp/BIN/bar-indep" [dir=back] + "debian/stamp/do-binary-arch" -> "binary-arch" [dir=back] + "debian/stamp/do-binary-indep" -> "binary-indep" [dir=back] + "debian/stamp/do-binary-arch" -> "binary" [dir=back] + "debian/stamp/do-binary-indep" -> "binary" [dir=back] + + + "debian/stamp/dummy-config-common" -> "debian/stamp/pre-config-common" [style="invis"] + "debian/stamp/do-pre-config-common" -> "debian/stamp/pre-config-arch" [style="invis"] + "debian/stamp/do-pre-config-common" -> "debian/stamp/pre-config-indep" [style="invis"] + "debian/stamp/do-pre-config-arch" -> "debian/stamp/CONFIG/foo-arch" [style="invis"] + "debian/stamp/do-pre-config-indep" -> "debian/stamp/CONFIG/bar-indep" [style="invis"] + + "debian/stamp/dep-configure-arch" -> "configure" [style="invis"] + "debian/stamp/dep-configure-indep" -> "configure" [style="invis"] + "debian/stamp/dep-configure-arch" -> "configure-arch" [style="invis"] + "debian/stamp/dep-configure-indep" -> "configure-arch" [style="invis"] + "debian/stamp/dep-configure-arch" -> "configure-indep" [style="invis"] + "debian/stamp/dep-configure-indep" -> "configure-indep" [style="invis"] + "configure-arch" -> "configure" [style="invis"] + "configure-indep" -> "configure" [style="invis"] + "configure" -> "debian/stamp/pre-build-common" [style="invis"] + + + "debian/stamp/pre-build-common" -> "debian/stamp/pre-build-indep" [style="invis"] + "debian/stamp/pre-build-common" -> "debian/stamp/pre-build-arch" [style="invis"] + + "debian/stamp/do-pre-build-arch" -> "debian/stamp/BUILD/foo-arch" [style="invis"] + "debian/stamp/do-pre-build-indep" -> "debian/stamp/BUILD/bar-indep" [style="invis"] + "debian/stamp/do-build-arch" -> "debian/stamp/post-build-arch" [style="invis"] + "debian/stamp/do-build-indep" -> "debian/stamp/post-build-indep" [style="invis"] + "debian/stamp/do-post-build-arch" -> "build-arch" [style="invis"] + "debian/stamp/do-post-build-arch" -> "build" [style="invis"] + "debian/stamp/do-post-build-indep" -> "build-indep" [style="invis"] + "debian/stamp/do-post-build-indep" -> "build" [style="invis"] + "build-arch" -> "build" [style="invis"] + "build-indep" -> "build" [style="invis"] + + "build" -> "debian/stamp/pre-inst-common" [style="invis"] + + "debian/stamp/pre-inst-common" -> "debian/stamp/pre-inst-indep" [style="invis"] + "debian/stamp/pre-inst-common" -> "debian/stamp/pre-inst-arch" [style="invis"] + "debian/stamp/do-pre-inst-arch" -> "debian/stamp/INST/foo-arch" [style="invis"] + "debian/stamp/do-pre-inst-indep" -> "debian/stamp/INST/bar-indep" [style="invis"] + + "install-arch" -> "install" [style="invis"] + "install-indep" -> "install" [style="invis"] + + "debian/stamp/pre-bin-common" -> "debian/stamp/pre-bin-indep" [style="invis"] + "debian/stamp/pre-bin-common" -> "debian/stamp/pre-bin-arch" [style="invis"] + + "install" -> "debian/stamp/pre-bin-common" [style="invis"] + "debian/stamp/do-pre-bin-arch" -> "debian/stamp/BIN/foo-arch" [style="invis"] + "debian/stamp/do-pre-bin-indep" -> "debian/stamp/BIN/bar-indep" [style="invis"] + + "binary-arch" -> "binary" [style="invis"] + "binary-indep" -> "binary" [style="invis"] + +} --- fvwm-2.5.27.ds.orig/debian/common/install_cmds.mk +++ fvwm-2.5.27.ds/debian/common/install_cmds.mk @@ -0,0 +1,58 @@ +######################### -*- Mode: Makefile-Gmake -*- ######################## +## install_cmds.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.internal.golden-gryphon.com ) +## Created On : Fri Jun 16 14:40:20 2006 +## Created On Node : glaurung.internal.golden-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Wed Sep 6 11:43:05 2006 +## Last Machine Used: glaurung.internal.golden-gryphon.com +## Update Count : 9 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : +## +## arch-tag: a38b6a93-2539-4034-9060-ae94d5c8a071 +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## 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, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## +############################################################################### + +# install commands +INSTALL = install +ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +install_file = $(INSTALL) -p -o root -g root -m 644 +install_program = $(INSTALL) -p -o root -g root -m 755 +install_script = $(INSTALL) -p -o root -g root -m 755 +make_directory = $(INSTALL) -p -d -o root -g root -m 755 + +define create_md5sum + create_md5sums_fn () { \ + cd $$1 ; \ + find . -type f \ + ! -regex './DEBIAN/.*' \ + ! -regex './etc/.*' $(EXTRA_MD5SUM_EXCLUDE) \ + -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums ; \ + if [ -z "DEBIAN/md5sums" ] ; then \ + rm -f "DEBIAN/md5sums" ; \ + fi ; \ + } ; \ + create_md5sums_fn +endef + +#Local variables: +#mode: makefile +#End: --- fvwm-2.5.27.ds.orig/debian/common/ChangeLog +++ fvwm-2.5.27.ds/debian/common/ChangeLog @@ -0,0 +1,59 @@ +2008-02-06 Manoj Srivastava + + * copt.mk: + srivasta@debian.org--lenny/skeleton-make-rules--main--0.1--patch-4 + The cross building support in Debian has been rewritten + to stop overriding the CC variable to $(MAKE) in order + to correctly support those packages that build internal + tools with the native compiler during the build. This + means that other packages that assume that CC will be + overridden by the cross-compiling build scripts now fail + to build. The patch is simply to set CC to + $(DEB_HOST_GNU_TYPE)-gcc only if a cross-build is + detected. + +2007-10-09 Manoj Srivastava + + * targets.mk: + srivasta@debian.org--lenny/skeleton-make-rules--main--0.1--patch-1 + fix dependency tree for targets, allow parralel + compilatoin. Many changes, thanks to dot. + +2007-09-20 Manoj Srivastava + + * targets.mk (stamp-clean): + srivasta@debian.org--lenny/skeleton-make-rules--main--0.1--base-0 + make clean not remove zero sized files. removed the part + that cleaned out zero sized files; since there are uses + for zero sized files (like, to nuke out files in + upstream sources and not inflate the diff. Any zero + sized files can still be nuked in the local.mk file. + +2006-10-02 Manoj Srivastava + + * checklibs: + srivasta@debian.org--etch/skeleton-make-rules--main--0.1--patch-15 + New file, to detect if there are unneeded library + dependencies + +2006-10-01 Manoj Srivastava + + * archvars.mk (doit): + srivasta@debian.org--etch/skeleton-make-rules--main--0.1--patch-14 + Add a macro to execute $(shell ...) macos verbosely to + help debugging. + +2006-09-15 Manoj Srivastava + + * targets.mk (stamp-clean): + srivasta@debian.org--etch/skeleton-make-rules--main--0.1--patch-13 + Exclude version control directories from the generic + clean command. + + +2006-08-23 Manoj Srivastava + + * pkgvars.mk (DEB_DISTRIBUTION): + srivasta@debian.org--etch/skeleton-make-rules--main--0.1--patch-6 + Add variable that contains the distribution information + --- fvwm-2.5.27.ds.orig/debian/common/README +++ fvwm-2.5.27.ds/debian/common/README @@ -0,0 +1,78 @@ +# This file provides a quick overview of this build system. The idea is +# to convert ./debian/rules into a framework, which abstracts most of +# the work required to create a Debian package into this common set of +# make snippets. + +# The rules file would look like this: + +## Include dpkg-architecture generated variables +# This make snippet uses dpkg-architecture to set the various +# DEB_BUILD* and DEB_HOST* variables. It also adds a couple of DEBUG +# macros for use in the rules file. +include debian/common/archvars.mk + +## variables useful for perl packages +# This sets things like the installed location of the private lib, +# arch dependent lib, and vendor library directories. +include debian/common/perlvars.mk + +## Install commands +# This sets the convenience macros install_{file,script,program} and +# a make directory macro, all run as root, for the install and binary +# targets. It also includes a macro to create the md5sum for +# installed files. +include debian/common/install_cmds.mk + +## Per package variable settings. +# This file sets the Make variables on a per package basis. Things +# like include files, C, C++, and LD flags are set here, as well as +# installation paths or, really, anything else that would be needed +# during packaging operations +include debian/local-vars.mk + +## Setting C compiler flags. +# This file takes care of setting C compiler flags, setting the +# compiler if a cross compilation effort is detected, and either +# arranges for binaries to be stripped or not based on +# DEB_BUILD_OPTIONS. +include debian/common/copt.mk + +## Set automake configuration flags +# This file sets confflags variable with the proper --host and +# --build options if it detects a cross compilation effort underway. +include debian/common/automake.mk + +# Set up the default target. +all: + @echo nothing to be done + +## Include the common targets +# This file sets up the flow of control during a Debian package build +# process, taking into account policy requirements (mandatory +# targets, ordering targets). It sets up rules for each package found +# in ./debian/control file in the package, and arranges package build +# to follow the order of configuration, building, installation, and +# binary package creation (and of course, clean). + +# The details of the targets can be seen visually by running dot on +# the accompanying targets.dot file. In the figure, the legend is: +# Nodes attributes: +# filled == Work target (most work is done in dependencies added +# to these targets). These are the targets referred to +# in the local.mk file +# Octagon == Phony target +# Oval == Real target based on a time stamp +# Double lines denote a mandatory target +# +# Edge attributes: A Red line indicates the target is called using +# $(MAKE) -f ./debian/rules . So the targets connected by the +# red lines are run after all the dependencies have been updated, but +# before anything else is done. + +include debian/common/targets.mk + +## The bulk of packaging +# This file adds dependencies to the double-colon rules set up in +# targets.mk above, and perform the bulk of the packaging. +include debian/local.mk + --- fvwm-2.5.27.ds.orig/debian/common/debconf.mk +++ fvwm-2.5.27.ds/debian/common/debconf.mk @@ -0,0 +1,101 @@ +############################ -*- Mode: Makefile -*- ########################### +## debconf.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.internal.golden-gryphon.com ) +## Created On : Fri Mar 12 11:11:31 2004 +## Created On Node : glaurung.internal.golden-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Mon Apr 11 13:19:10 2005 +## Last Machine Used: glaurung.internal.golden-gryphon.com +## Update Count : 20 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : helps with using debconf +## +## arch-tag: 32b933a9-05ad-4c03-97a8-8644745b832a +## +############################################################################### + +# The idea behind this scheme is that the maintainer (or whoever's +# building the package for upload to unstable) has to build on a +# machine with po-debconf installed, but nobody else does. + +# When building with po-debconf, a format 1 (no encoding specifications, +# woody-compatible) debian/templates file is generated in the clean target +# and shipped in the source package, but a format 2 (UTF8-encoded, +# woody-incompatible) debian/templates file is generated in binary-arch +# for the binary package only. + +# When building without po-debconf, the binary package simply reuses the +# woody-compatible debian/templates file that was produced by the clean +# target of the maintainer's build. + +# Also, make sure that debian/control has ${debconf-depends} in the +# appropriate Depends: line., and use the following in the binary +# target: +# dpkg-gencontrol -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' +# + +# WARNING!! You need to create the templates.master file before this all works. + +ifeq (,$(wildcard /usr/bin/po2debconf)) + PO2DEBCONF := no + MINDEBCONFVER := 0.5 +else + PO2DEBCONF := yes + MINDEBCONFVER := 1.2.0 +endif + + +# Hack for woody compatibility. This makes sure that the +# debian/templates file shipped in the source package doesn't specify +# encodings, which woody's debconf can't handle. If building on a +# system with po-debconf installed the binary-arch target will +# generate a better version for sarge. Only do this if there is a +# templates.master, or else the debian/templates file can get +# damamged. +ifeq ($(PO2DEBCONF),yes) + ifeq (,$(wildcard debian/templates.master)) +define CREATE_COMPATIBLE_TEMPLATE + echo Not modifying templates +endef + else +define CREATE_COMPATIBLE_TEMPLATE + echo 1 > debian/po/output + po2debconf debian/templates.master > debian/templates + rm -f debian/po/output +endef + endif +else +define CREATE_COMPATIBLE_TEMPLATE + echo Not modifying templates +endef +endif + + +ifeq ($(PO2DEBCONF),yes) + ifeq (,$(wildcard debian/templates.master)) +define INSTALL_TEMPLATE + echo using old template +endef + else +define INSTALL_TEMPLATE + po2debconf debian/templates.master > debian/templates +endef + endif +else +define INSTALL_TEMPLATE + echo using old template +endef +endif + +# the tool podebconf-report-po is also a great friend to have in such +# circumstances +define CHECKPO + @for i in debian/po/*.po; do \ + if [ -f $$i ]; then \ + echo \"Checking: $$i\"; \ + msgmerge -U $$i debian/po/templates.pot; \ + msgfmt -o /dev/null -c --statistics $$i; \ + fi; \ + done +endef --- fvwm-2.5.27.ds.orig/debian/common/copt.mk +++ fvwm-2.5.27.ds/debian/common/copt.mk @@ -0,0 +1,44 @@ +############################ -*- Mode: Makefile -*- ########################### +## copt.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Sat Nov 15 02:48:40 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Sat Nov 15 02:49:07 2003 +## Last Machine Used: glaurung.green-gryphon.com +## Update Count : 1 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : +## +## arch-tag: a0045c20-f1b3-4852-9a4b-1a33ebd7c1b8 +## +############################################################################### + +PREFIX := /usr +# set CC to $(DEB_HOST_GNU_TYPE)-gcc only if a cross-build is detected +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CC=$(DEB_HOST_GNU_TYPE)-gcc +else + CC = cc +endif + +# Policy 10.1 says to make this the default +CFLAGS = -Wall -g + +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +## ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +## endif + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP += -s + LDFLAGS += -s + INT_INSTALL_TARGET = install +else + INT_INSTALL_TARGET = install +endif --- fvwm-2.5.27.ds.orig/debian/common/archvars.mk +++ fvwm-2.5.27.ds/debian/common/archvars.mk @@ -0,0 +1,118 @@ +############################ -*- Mode: Makefile -*- ########################### +## archvars.mk --- +## Author : Manoj Srivastava ( srivasta@golden-gryphon.com ) +## Created On : Sat Nov 15 02:40:56 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Tue Nov 16 23:36:15 2004 +## Last Machine Used: glaurung.internal.golden-gryphon.com +## Update Count : 5 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : calls dpkg-architecture and sets up various arch +## related variables +## +## arch-tag: e16dd848-0fd6-4c0e-ae66-bef20d1f7c63 +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## 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, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## +############################################################################### + + +DPKG_ARCH := dpkg-architecture + +ifeq ($(strip $(KPKG_ARCH)),um) + MAKING_VIRTUAL_IMAGE:=YES +endif +ifeq ($(strip $(KPKG_ARCH)),xen) + MAKING_VIRTUAL_IMAGE:=YES +endif + +ifneq ($(strip $(CONFIG_UM)),) + MAKING_VIRTUAL_IMAGE:=YES + KPKG_ARCH=um +endif + +ifneq ($(strip $(CONFIG_XEN)),) + MAKING_VIRTUAL_IMAGE:=YES + ifneq ($(strip $(CONFIG_X86_XEN)$(CONFIG_X86_64_XEN)),) + KPKG_SUBARCH=xen + else + KPKG_ARCH=xen + ifeq ($(strip $(CONFIG_XEN_PRIVILEGED_GUEST)),) + KPKG_SUBARCH=xenu + else + KPKG_SUBARCH=xen0 + endif + endif +endif + +ifdef KPKG_ARCH + ifeq ($(strip $(MAKING_VIRTUAL_IMAGE)),) + ifneq ($(CROSS_COMPILE),-) + ha:=-a$(KPKG_ARCH) + endif + endif +endif + +# set the dpkg-architecture vars +export DEB_BUILD_ARCH := $(shell $(DPKG_ARCH) -qDEB_BUILD_ARCH) +export DEB_BUILD_GNU_CPU := $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_CPU) +export DEB_BUILD_GNU_SYSTEM:= $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_SYSTEM) +export DEB_BUILD_GNU_TYPE := $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_ARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_OS := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_ARCH_OS \ + 2>/dev/null|| true) +export DEB_HOST_ARCH_CPU := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_ARCH_CPU \ + 2>/dev/null|| true) +export DEB_HOST_GNU_CPU := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_GNU_CPU) +export DEB_HOST_GNU_SYSTEM := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_GNU_SYSTEM) +export DEB_HOST_GNU_TYPE := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_GNU_TYPE) + +# arrgh. future proofing +ifeq ($(DEB_HOST_GNU_SYSTEM), linux) + DEB_HOST_GNU_SYSTEM=linux-gnu +endif +ifeq ($(DEB_HOST_ARCH_OS),) + ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu) + DEB_HOST_ARCH_OS := linux + endif + ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu) + DEB_HOST_ARCH_OS := kfreebsd + endif +endif + +REASON = @if [ -f $@ ]; then \ + echo "====== making $(notdir $@) because of $(notdir $?) ======";\ + else \ + echo "====== making target $@ [new prereqs: $(notdir $?)]======"; \ + fi + +OLDREASON = @if [ -f $@ ]; then \ + echo "====== making $(notdir $@) because of $(notdir $?) ======";\ + else \ + echo "====== making (creating) $(notdir $@) ======"; \ + fi + +LIBREASON = @echo "====== making $(notdir $@)($(notdir $%))because of $(notdir $?)======" + + +# macro outputing $(1) if DEBUG_DEBIAN_RULES is set, and resolving it +# in all cases usage $(call doit,some shell command) +doit = $(if $(DEBUG_DEBIAN_RULES),$(warning DEBUG: $(1)))$(shell $(1)) + +#Local variables: +#mode: makefile +#End: --- fvwm-2.5.27.ds.orig/debian/common/automake.mk +++ fvwm-2.5.27.ds/debian/common/automake.mk @@ -0,0 +1,37 @@ +############################ -*- Mode: Makefile -*- ########################### +## automake.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Sat Nov 15 02:47:23 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Sat Nov 15 02:47:53 2003 +## Last Machine Used: glaurung.green-gryphon.com +## Update Count : 1 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : +## +## arch-tag: 1fabe69b-7cc8-4ecc-9411-bc5906b19857 +## +############################################################################### + +AUTOCONF_VERSION:=$(shell if [ -e configure ]; then \ + grep "Generated automatically using autoconf" \ + configure | sed -e 's/^.*autoconf version //g'; \ + fi) +HAVE_NEW_AUTOMAKE:=$(shell if [ "X$(AUTOCONF_VERSION)" != "X2.13" ]; then \ + echo 'YES' ; fi) + +ifneq ($(strip $(HAVE_NEW_AUTOMAKE)),) + ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_BUILD_GNU_TYPE) + else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) + endif +else + ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += $(DEB_HOST_GNU_TYPE) + else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) + endif +endif --- fvwm-2.5.27.ds.orig/debian/common/perlvars.mk +++ fvwm-2.5.27.ds/debian/common/perlvars.mk @@ -0,0 +1,27 @@ +############################ -*- Mode: Makefile -*- ########################### +## perlvars.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Sat Nov 15 02:55:47 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Sat Dec 13 13:50:58 2003 +## Last Machine Used: glaurung.green-gryphon.com +## Update Count : 3 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : +## +## arch-tag: a97a01ba-d08d-404d-aa81-572717c03e6c +## +############################################################################### + +# Perl variables +PERL = /usr/bin/perl + +INSTALLPRIVLIB = $(TMPTOP)/$(shell \ + perl -e 'use Config; print "$$Config{'installprivlib'}\n";') +INSTALLARCHLIB = $(TMPTOP)/$(shell \ + perl -e 'use Config; print "$$Config{'installarchlib'}\n";') +INSTALLVENDORLIB =$(TMPTOP)/$(shell \ + perl -e 'use Config; print "$$Config{'vendorlibexp'}\n";') +CONFIG = INSTALLDIRS=vendor --- fvwm-2.5.27.ds.orig/debian/common/checklibs +++ fvwm-2.5.27.ds/debian/common/checklibs @@ -0,0 +1,74 @@ +#! /bin/sh +# -*- Mode: Sh -*- +# checklibs.sh --- +# Author : Manoj Srivastava ( srivasta@glaurung.internal.golden-gryphon.com ) +# Created On : Fri Sep 29 15:36:22 2006 +# Created On Node : glaurung.internal.golden-gryphon.com +# Last Modified By : Manoj Srivastava +# Last Modified On : Fri Sep 29 22:53:27 2006 +# Last Machine Used: glaurung.internal.golden-gryphon.com +# Update Count : 43 +# Status : Unknown, Use with caution! +# HISTORY : +# Description : +# +# arch-tag: 8ba11489-77fa-45a0-92c4-9c5b162ee119 +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# Make sure we abort on error +set -e +progname="$(basename \"$0\")" + +trap 'rm -f search_patterns.txt;' ALRM HUP INT PIPE TERM ABRT FPE BUS QUIT SEGV ILL EXIT + +# Find all undefined symbols in all ELF objects in this tree +readelf -s -D -W $(find . -type f -print0 | xargs -0r file | grep " ELF" | \ + awk '{print $1}' | sed -e 's/:$//') | grep UND | grep -v LOCAL | + perl -ple 's/.*\s(\S+)\s*$/\^$1\$/g' | sort -u > search_patterns.txt; + +# Find all the libraries needed in this tree +objdump -T --private-headers $(find . -type f -print0 | xargs -0r file | grep " ELF" | \ + awk '{print $1}' | sed -e 's/:$//') | grep NEEDED | sort -u | awk '{print $2}' | + while read lib; do + # For each library, see where it lives o the file system + LIB= + for library_dir in "/lib" "/usr/lib" $EXTRA_LIBRARY_PATHS; do + if [ -e "$library_dir/$lib" ]; then + LIB="$library_dir/$lib"; + break + fi + done + if [ -z "$LIB" ]; then + echo >&2 "Can't find $lib" + continue + fi + # If we fond the library, find what symbols it defines, and if these symbols + # are some that we need + if readelf -s -D -W $LIB | grep -v UND | perl -ple 's/.*\s(\S+)\s*$/$1/g' | \ + sort -u | grep -q -f search_patterns.txt ; then + # Library provides at least some symbols we need + if [ -n "$DEBUG" ]; then echo "Found $LIB"; fi + else + # Library does not provide any symbols we need + echo "$LIB" ; + fi +done + +# Get rid of the intermediate file +rm -f search_patterns.txt; +exit 0 + --- fvwm-2.5.27.ds.orig/debian/common/targets.mk +++ fvwm-2.5.27.ds/debian/common/targets.mk @@ -0,0 +1,525 @@ +############################ -*- Mode: Makefile -*- ########################### +## targets.mk --- +## Author : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) +## Created On : Sat Nov 15 01:10:05 2003 +## Created On Node : glaurung.green-gryphon.com +## Last Modified By : Manoj Srivastava +## Last Modified On : Sat Apr 26 22:33:09 2008 +## Last Machine Used: anzu.internal.golden-gryphon.com +## Update Count : 131 +## Status : Unknown, Use with caution! +## HISTORY : +## Description : The top level targets mandated by policy, as well as +## their dependencies. +## +## arch-tag: a81086a7-00f7-4355-ac56-8f38396935f4 +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## 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, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## +############################################################################### + +####################################################################### +####################################################################### +############### Miscellaneous ############### +####################################################################### +####################################################################### +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +define TESTROOT + @test $$(id -u) = 0 || (echo need root priviledges; exit 1) +endef + +testroot: + $(TESTROOT) + +checkpo: + $(CHECKPO) + +# arch-buildpackage likes to call this +prebuild: + +# OK. We have two sets of rules here, one for arch dependent packages, +# and one for arch independent packages. We have already calculated a +# list of each of these packages. + +# In each set, we may need to do things in five steps: configure, +# build, install, package, and clean. Now, there can be a common +# actions to be taken for all the packages, all arch dependent +# packages, all all independent packages, and each package +# individually at each stage. + +########################################################################### +# The current code does a number of things: It ensures that the highest # +# dependency at any stage (usually the -Common target) depends on the # +# stamp-STAGE of the previous stage; so no work on a succeeding stage can # +# start before the previous stage is all done. # +########################################################################### + +################################################################################# +# In the following, the do_* targets make sure all the real non-generic work is # +# done, but are not in the direct line of dependencies. This makes sure # +# that previous step in the order is all up to date before any of the per # +# package target dependencies are run. # +################################################################################# + + +####################################################################### +####################################################################### +############### Configuration ############### +####################################################################### +####################################################################### +# Just a dummy target to make sure that the stamp directory exists +debian/stamp/dummy-config-common: + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +# Configuration tasks common to arch and arch indep packages go here +debian/stamp/pre-config-common: debian/stamp/dummy-config-common + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +# Do not add dependencies to this rule +debian/stamp/do-pre-config-common: debian/stamp/dummy-config-common + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/pre-config-common + @echo done > $@ + +# Arch specific and arch independent tasks go here +debian/stamp/pre-config-arch: debian/stamp/do-pre-config-common + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +# Do not add dependencies to this rule +debian/stamp/do-pre-config-arch: debian/stamp/do-pre-config-common + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/pre-config-arch + @echo done > $@ + + +debian/stamp/pre-config-indep: debian/stamp/do-pre-config-common + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +# Do not add dependencies to this rule +debian/stamp/do-pre-config-indep: debian/stamp/do-pre-config-common + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/pre-config-indep + @echo done > $@ + +# Per package work happens as an added dependency of this rule. +$(patsubst %,debian/stamp/CONFIG/%,$(DEB_ARCH_PACKAGES)) : debian/stamp/CONFIG/% : debian/stamp/do-pre-config-arch + $(REASON) + $(checkdir) + @test -d debian/stamp/CONFIG || mkdir -p debian/stamp/CONFIG + @echo done > $@ +$(patsubst %,debian/stamp/CONFIG/%,$(DEB_INDEP_PACKAGES)) : debian/stamp/CONFIG/% : debian/stamp/do-pre-config-indep + $(REASON) + $(checkdir) + @test -d debian/stamp/CONFIG || mkdir -p debian/stamp/CONFIG + @echo done > $@ + +# Do not add dependencies to this rule +debian/stamp/dep-configure-arch: debian/stamp/do-pre-config-arch $(patsubst %,debian/stamp/CONFIG/%,$(DEB_ARCH_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +# Do not add dependencies to this rule +debian/stamp/dep-configure-indep: debian/stamp/do-pre-config-indep $(patsubst %,debian/stamp/CONFIG/%,$(DEB_INDEP_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +debian/stamp/do-configure-arch: debian/stamp/do-pre-config-arch + $(REASON) + @test -d debian/stamp/CONFIG || mkdir -p debian/stamp/CONFIG + $(MAKE) -f debian/rules debian/stamp/dep-configure-arch + @echo done > $@ +debian/stamp/do-configure-indep: debian/stamp/do-pre-config-indep + $(REASON) + @test -d debian/stamp/CONFIG || mkdir -p debian/stamp/CONFIG + $(MAKE) -f debian/rules debian/stamp/dep-configure-indep + @echo done > $@ + +# These three targets are required by policy +configure-arch: debian/stamp/do-configure-arch + $(REASON) +configure-indep: debian/stamp/do-configure-indep + $(REASON) +configure: debian/stamp/do-configure-arch debian/stamp/do-configure-indep + $(REASON) + +####################################################################### +####################################################################### +############### Build ############### +####################################################################### +####################################################################### +# tasks common to arch and arch indep packages go here +debian/stamp/pre-build-common: + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +# Arch specific and arch independent tasks go here +debian/stamp/pre-build-arch: debian/stamp/do-configure-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-pre-build-arch: debian/stamp/do-configure-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @test -e debian/stamp/pre-build-common || $(MAKE) -f debian/rules debian/stamp/pre-build-common + $(MAKE) -f debian/rules debian/stamp/pre-build-arch + @echo done > $@ + +debian/stamp/pre-build-indep: debian/stamp/do-configure-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-pre-build-indep: debian/stamp/do-configure-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @test -e debian/stamp/pre-build-common || $(MAKE) -f debian/rules debian/stamp/pre-build-common + $(MAKE) -f debian/rules debian/stamp/pre-build-indep + @echo done > $@ + +# Per package work happens as an added dependency of this rule. +$(patsubst %,debian/stamp/BUILD/%,$(DEB_ARCH_PACKAGES)) : debian/stamp/BUILD/% : debian/stamp/do-pre-build-arch + $(REASON) + $(checkdir) + @test -d debian/stamp/BUILD || mkdir -p debian/stamp/BUILD + @echo done > $@ + +$(patsubst %,debian/stamp/BUILD/%,$(DEB_INDEP_PACKAGES)) : debian/stamp/BUILD/% : debian/stamp/do-pre-build-indep + $(REASON) + $(checkdir) + @test -d debian/stamp/BUILD || mkdir -p debian/stamp/BUILD + @echo done > $@ + +# These do targeta make sure all the per package configuration is +# done, but is not in the direct line of dependencies. This makes sure +# that pre-config targets are all up to date before any of the per +# package target dependencies are run. +debian/stamp/dep-build-arch: debian/stamp/do-pre-build-arch $(patsubst %,debian/stamp/BUILD/%,$(DEB_ARCH_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +debian/stamp/dep-build-indep: debian/stamp/do-pre-build-indep $(patsubst %,debian/stamp/BUILD/%,$(DEB_INDEP_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +debian/stamp/do-build-arch: debian/stamp/do-pre-build-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/dep-build-arch + @echo done > $@ +debian/stamp/do-build-indep: debian/stamp/do-pre-build-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/dep-build-indep + @echo done > $@ + +# required +build-arch: debian/stamp/do-build-arch + $(REASON) +build-indep: debian/stamp/do-build-indep + $(REASON) +build: debian/stamp/do-build-arch debian/stamp/do-build-indep + $(REASON) + +# Work here +debian/stamp/post-build-arch: debian/stamp/do-build-arch + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-post-build-arch: debian/stamp/do-build-arch + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/post-build-arch + @echo done > $@ + +debian/stamp/post-build-indep: debian/stamp/do-build-indep + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-post-build-indep: debian/stamp/do-build-indep + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/post-build-indep + @echo done > $@ + +####################################################################### +####################################################################### +############### Install ############### +####################################################################### +####################################################################### +# tasks common to arch and arch indep packages go here +debian/stamp/pre-inst-common: + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +# Arch specific and arch independent tasks go here +debian/stamp/pre-inst-arch: debian/stamp/do-post-build-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-pre-inst-arch: debian/stamp/do-post-build-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @test -e debian/stamp/INST-common || $(MAKE) -f debian/rules debian/stamp/pre-inst-common + $(MAKE) -f debian/rules debian/stamp/pre-inst-arch + @echo done > $@ + +debian/stamp/pre-inst-indep: debian/stamp/do-post-build-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-pre-inst-indep: debian/stamp/do-post-build-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @test -e debian/stamp/INST-common || $(MAKE) -f debian/rules debian/stamp/pre-inst-common + $(MAKE) -f debian/rules debian/stamp/pre-inst-indep + @echo done > $@ + + +# Per package work happens as an added dependency of this rule +$(patsubst %,debian/stamp/INST/%,$(DEB_ARCH_PACKAGES)) : debian/stamp/INST/% : debian/stamp/do-pre-inst-arch + $(REASON) + $(checkdir) + @test -d debian/stamp/INST || mkdir -p debian/stamp/INST + @echo done > $@ +$(patsubst %,debian/stamp/INST/%,$(DEB_INDEP_PACKAGES)) : debian/stamp/INST/% : debian/stamp/do-pre-inst-indep + $(REASON) + $(checkdir) + @test -d debian/stamp/INST || mkdir -p debian/stamp/INST + @echo done > $@ + +# These do targeta make sure all the per package configuration is +# done, but is not in the direct line of dependencies. This makes sure +# that pre-config targets are all up to date before any of the per +# package target dependencies are run. +debian/stamp/dep-install-arch: debian/stamp/do-pre-inst-arch $(patsubst %,debian/stamp/INST/%,$(DEB_ARCH_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +debian/stamp/dep-install-indep: debian/stamp/do-pre-inst-indep $(patsubst %,debian/stamp/INST/%,$(DEB_INDEP_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + + +debian/stamp/do-install-arch: debian/stamp/do-pre-inst-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/dep-install-arch + @echo done > $@ +debian/stamp/do-install-indep: debian/stamp/do-pre-inst-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/dep-install-indep + @echo done > $@ + +#required +install-arch: debian/stamp/do-install-arch + $(REASON) + $(TESTROOT) +install-indep: debian/stamp/do-install-indep + $(REASON) + $(TESTROOT) +install: debian/stamp/do-install-arch debian/stamp/do-install-indep + $(REASON) + $(TESTROOT) + +####################################################################### +####################################################################### +############### Package ############### +####################################################################### +####################################################################### +# tasks common to arch and arch indep packages go here +debian/stamp/pre-bin-common: + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +# Arch specific and arch independent tasks go here +debian/stamp/pre-bin-arch: debian/stamp/do-install-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-pre-bin-arch: debian/stamp/do-install-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @test -e debian/stamp/BIN-common || $(MAKE) -f debian/rules debian/stamp/pre-bin-common + $(MAKE) -f debian/rules debian/stamp/pre-bin-arch + @echo done > $@ + +debian/stamp/pre-bin-indep: debian/stamp/do-install-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ +debian/stamp/do-pre-bin-indep: debian/stamp/do-install-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + @test -e debian/stamp/BIN-common || $(MAKE) -f debian/rules debian/stamp/pre-bin-common + $(MAKE) -f debian/rules debian/stamp/pre-bin-indep + @echo done > $@ + +# Per package work happens as an added dependency of this rule +$(patsubst %,debian/stamp/BIN/%,$(DEB_ARCH_PACKAGES)) : debian/stamp/BIN/% : debian/stamp/do-pre-bin-arch + $(REASON) + $(checkdir) + @test -d debian/stamp/BIN || mkdir -p debian/stamp/BIN + @echo done > $@ + +$(patsubst %,debian/stamp/BIN/%,$(DEB_INDEP_PACKAGES)) : debian/stamp/BIN/% : debian/stamp/do-pre-bin-indep + $(REASON) + $(checkdir) + @test -d debian/stamp/BIN || mkdir -p debian/stamp/BIN + @echo done > $@ + +# These do targeta make sure all the per package work is done, but is +# not in the direct line of dependencies. This makes sure that +# pre-config targets are all up to date before any of the per package +# target dependencies are run. +debian/stamp/dep-binary-arch: debian/stamp/pre-bin-arch $(patsubst %,debian/stamp/BIN/%,$(DEB_ARCH_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +debian/stamp/dep-binary-indep: debian/stamp/pre-bin-indep $(patsubst %,debian/stamp/BIN/%,$(DEB_INDEP_PACKAGES)) + $(REASON) + @test -d debian/stamp || mkdir -p debian/stamp + @echo done > $@ + +debian/stamp/do-binary-arch: debian/stamp/do-pre-bin-arch + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/dep-binary-arch + @echo done > $@ +debian/stamp/do-binary-indep: debian/stamp/do-pre-bin-indep + $(REASON) + $(checkdir) + @test -d debian/stamp || mkdir -p debian/stamp + $(MAKE) -f debian/rules debian/stamp/dep-binary-indep + @echo done > $@ +# required +binary-arch: debian/stamp/do-binary-arch + $(REASON) + $(TESTROOT) +binary-indep: debian/stamp/do-binary-indep + $(REASON) + $(TESTROOT) +binary: debian/stamp/do-binary-arch debian/stamp/do-binary-indep + $(REASON) + $(TESTROOT) + @echo arch package = $(DEB_ARCH_PACKAGES) + @echo indep packages = $(DEB_INDEP_PACKAGES) + +####################################################################### +####################################################################### +############### Clean ############### +####################################################################### +####################################################################### +# Work here +CLN-common:: + $(REASON) + $(checkdir) + +# sync Work here +CLN-arch:: CLN-common + $(REASON) + $(checkdir) +CLN-indep:: CLN-common + $(REASON) + $(checkdir) +# Work here +$(patsubst %,CLEAN/%,$(DEB_ARCH_PACKAGES)) :: CLEAN/% : CLN-arch + $(REASON) + $(checkdir) +$(patsubst %,CLEAN/%,$(DEB_INDEP_PACKAGES)) :: CLEAN/% : CLN-indep + $(REASON) + $(checkdir) + +clean-arch: CLN-arch $(patsubst %,CLEAN/%,$(DEB_ARCH_PACKAGES)) + $(REASON) +clean-indep: CLN-indep $(patsubst %,CLEAN/%,$(DEB_INDEP_PACKAGES)) + $(REASON) +clean: clean-indep clean-arch + $(REASON) + -test -f Makefile && $(MAKE) distclean + -rm -f $(FILES_TO_CLEAN) $(STAMPS_TO_CLEAN) + -rm -rf $(DIRS_TO_CLEAN) debian/stamp + -rm -f core TAGS \ + `find . ! -regex '.*/\.git/.*' ! -regex '.*/\{arch\}/.*' \ + ! -regex '.*/CVS/.*' ! -regex '.*/\.arch-ids/.*' \ + ! -regex '.*/\.svn/.*' \ + \( -name '*.orig' -o -name '*.rej' -o -name '*~' -o \ + -name '*.bak' -o -name '#*#' -o -name '.*.orig' -o \ + -name '.*.rej' -o -name '.SUMS' \) \ + -print` + + +####################################################################### +####################################################################### +############### ############### +####################################################################### +####################################################################### +.PHONY: configure-arch configure-indep configure \ + build-arch build-indep build \ + install-arch install-indep install \ + binary-arch binary-indep binary \ + CLN-common CLN-indep CLN-arch clean-arch clean-indep clean \ + $(patsubst %,CLEAN/%, $(DEB_INDEP_PACKAGES)) $(patsubst %,CLEAN/%, $(DEB_ARCH_PACKAGES)) \ + implode explode prebuild checkpo + + +#Local variables: +#mode: makefile +#End: --- fvwm-2.5.27.ds.orig/debian/manoj/restart.hook +++ fvwm-2.5.27.ds/debian/manoj/restart.hook @@ -0,0 +1,2 @@ +# Stuff to be done when we re-start fvwm + --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmAnimate.hook +++ fvwm-2.5.27.ds/debian/manoj/FvwmAnimate.hook @@ -0,0 +1 @@ +# This file created by FvwmAnimate --- fvwm-2.5.27.ds.orig/debian/manoj/post_menu.hook +++ fvwm-2.5.27.ds/debian/manoj/post_menu.hook @@ -0,0 +1,22 @@ +# This menu will fire up some very common utilities +DestroyMenu Utilities +AddToMenu "Utilities" "Utilities" Title +Read main-menu.hook + + +#======================================================== +# One more complex function - couldn't be defined earlier because it used +# pop-up menus +# +# This creates a motif-ish sticky menu for the title-bar window-ops +# pop-up +# Menu acts like normal twm menu if you just hold the button down, +# but if you click instead, the menu stays up, motif style +AddToFunc "window_ops_func" "C" PopUp Window-Ops2 ++ "M" PopUp Window-Ops2 + + +AddToFunc "general_ops_func" "M" PopUp General ++ "C" PopUp General ++ "D" PopUp General + --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-Rlogin +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-Rlogin @@ -0,0 +1,30 @@ +DestroyModuleConfig FvwmForm-Rlogin: * +*FvwmForm-Rlogin: WarpPointer +*FvwmForm-Rlogin: Line center +*FvwmForm-Rlogin: Text "Login to Remote Host" +*FvwmForm-Rlogin: Line center +*FvwmForm-Rlogin: Text "Host:" +*FvwmForm-Rlogin: Input HostName 20 "" +*FvwmForm-Rlogin: Line center +*FvwmForm-Rlogin: Selection UserSel single +*FvwmForm-Rlogin: Choice Default Default on "same user" +*FvwmForm-Rlogin: Choice Custom Custom off "user:" +*FvwmForm-Rlogin: Input UserName 10 "" +*FvwmForm-Rlogin: Line expand +*FvwmForm-Rlogin: Button quit "Login" ^M +*FvwmForm-Rlogin: Command Exec exec ssh $(Custom?-l $(UserName)) $(HostName) xterm -T $(UserName)@$(HostName) -display $HOSTDISPLAY & +# Before saving the data, remove any previously saved data: +*FvwmForm-Rlogin: Command DestroyModuleConfig FvwmForm-RloginDefault: * +# The "Login" button causes a login and a saving of the current data: +*FvwmForm-Rlogin: Command !( /bin/echo \ + "# This file last created by FvwmForm-Rlogin on: `/bin/date`."; /bin/echo \ + '*FvwmForm-RloginDefault: HostName $(HostName)' ; /bin/echo \ + '*FvwmForm-RloginDefault: UserName $(UserName)' ; /bin/echo \ + '*FvwmForm-RloginDefault: Default $(Default?on)' ; /bin/echo \ + '*FvwmForm-RloginDefault: Custom $(Custom?on)' \ +) > ${FVWM_USERDIR}/.FvwmForm-Rlogin +*FvwmForm-Rlogin: Button restart "Reset" +*FvwmForm-Rlogin: Button quit "Cancel" ^[ +*FvwmForm-Rlogin: Command Nop +# Tell FvwmForm to read vars from the .FvwmForm-RloginDefault file: +*FvwmForm-Rlogin: UseData .FvwmForm-Rlogin *FvwmForm-RloginDefault --- fvwm-2.5.27.ds.orig/debian/manoj/binding.hook +++ fvwm-2.5.27.ds/debian/manoj/binding.hook @@ -0,0 +1,406 @@ +#===================================================== C. mouse bindings +# C. This defines the mouse bindings + +# First, for the mouse in the root window +# Button 1 gives the Utilities menu +# Button 2 gives the Window-Ops menu +# Button 3 gives the WindowList (like TwmWindows) +# I use the AnyModifier (A) option for the modifier field, so you can hold down +# any shift-control-whatever combination you want! + +# Button Context Modifi Function +Mouse 3 RD N Menu "Utilities" Nop +Mouse 2 RD N Menu "Window-Ops" Nop +Mouse 1 RD N Function "general_ops_func" +Mouse 3 FIST CM Menu "Utilities" Nop +Mouse 2 FIST CM Menu "Window-Ops" Nop +Mouse 1 FIST CM Function "general_ops_func" + +# To obtain the gnome menu with Alt-button1 on the root window +Mouse 1 RD M SendToModule FvwmGtk gnome-all + + +# +# Now the title bar buttons +# Any button in the left title-bar button gives the window ops menu +# Any button in the right title-bar button Iconifies the window +# Any button in the rightmost title-bar button maximizes +# Note the use of "Mouse 0" for AnyButton. +# The title bar buttons are numbered with odd numbered buttons on the +# left side of the title bar and even numbers on the right. Smaller- +# numbered buttons are displayed toward the outside of the window while +# larger-numbered buttons appear toward the middle of the window (0 is +# short for 10). In summary, the buttons are numbered: +# +# 1 3 5 7 9 0 8 6 4 2 + + + +#left side +# Button Context Modifi Function +Mouse 0 1 A Function "window_ops_func" +Mouse 0 3 A Function "max_vert_func" +Mouse 0 5 A Function "max_hor_func" +Mouse 0 7 A Function "max_diag_func" +Mouse 0 9 A Function FuncFvwmMaximizeFullScreen +#Mouse 0 9 A Resize + +#right side +# Button Context Modifi Function +Mouse 0 2 A Close +Mouse 0 4 A IconifyWithScreenshot +Mouse 0 6 A Function "Move-or-Lower" +Mouse 0 8 A Function "funky_cancel" +Mouse 0 0 A Stick + +# Now the rest of the frame +# Here I invoke my complex functions for Move-or-lower, Move-or-raise, +# and Resize-or-Raise. +# Button 1 in the side, or corner pieces, with any modifiers, gives +# resize or raise +Mouse 1 FS A Function "Resize-or-Raise" +# Button 1 in the title, w/ any modifiers, gives move or raise +Mouse 1 T A Function "Move-or-Raise" +#Mouse 1 T M Function move_noresist + +# Button 1 in an icons gives move for a drag, de-iconify for a +# double-click, nothing for a single click +# Button 2 in an icon, w/ any modifiers, gives de-iconify + +Mouse 1 I A Function "Move-or-Iconify" +Mouse 2 I A Iconify + +# Button 2 in the corners, sides, or title-bar gives the window ops +# menu +Mouse 2 F A Function "window_ops_func" +Mouse 2 TS A Function "Move-or-Iconify" +# Button 3 anywhere in the decoration (except the title-bar buttons) +# does a raise-lower +Mouse 3 IF A RaiseLower +Mouse 3 TS A Function "Move-or-Raise" + +# Button 3 in the window, with the Modifier-1 key (usually alt or +# diamond) gives Raise-Lower. Used to use control here, but that +# interferes with xterm +#Mouse 3 W M RaiseLower + +#===================================================== D. key bindings +# D. key bindings + +# Arrow Keys +# press arrow + control anywhere, and scroll by 1 page +Key Left FIRST C Scroll -100000 0 +Key Right FIRST C Scroll +100000 +0 +Key Up FIRST C Scroll +0 -100000 +Key Down FIRST C Scroll +0 +100000 +# Also for the Mouse wheel +#Mouse 4 RD A Scroll +0 -100000 +#Mouse 5 RD A Scroll +0 +100000 +# Alternately, use the mouse wheel to set volumes: +Mouse 4 RD A Exec aumix -v+5 -w+5 +Mouse 5 RD A Exec aumix -v-5 -w-5 +# With Control. move desks +Mouse 4 RD C GotoDesk -1 +Mouse 5 RD C GotoDesk +1 + + + +# press arrow + Alt anywhere +# Move window 5% to the left +Key Left FIST M Move w-5 0 Warp +# Move window 5% to the right +Key Right FIST M Move w+5 0 Warp +# Move window 5% to the top +Key Up FIST M Move 0 w-5 Warp +# Move window 5% to the bottom +Key Down FIST M Move 0 w+5 Warp + +# directing a window to move in a given direction (Up, Down, Left, +# Right) until it hits something; eg a screen edge or another window. +Key Down WTF SM PackWrapperDown +Key Up WTF SM PackWrapperUp + +Key 5 FIST M Move m+0 m+0 Warp +Key 1 FIST M Move 0 -0 Warp +Key 2 FIST M Move 50 -0 Warp +Key 3 FIST M Move -0 -0 Warp +Key 4 FIST M Move -0 50 Warp +Key 6 FIST M Move 0 50 Warp +Key 7 FIST M Move 0 -0 Warp +Key 8 FIST M Move 50 0 Warp +Key 9 FIST M Move -0 0 Warp + +# press arrow on root, and scroll by 1 page +Key Left RD AN Scroll -100000 0 +Key Right RD AN Scroll +100000 +0 +Key Up RD AN Scroll +0 -100000 +Key Down RD AN Scroll +0 +100000 + +# press arrow + meta key, and scroll by 1/10 of a page +Key Left FIRST S Scroll -10000 +0 +Key Right FIRST S Scroll +10000 +0 +Key Up FIRST S Scroll +0 -10000 +Key Down FIRST S Scroll +0 +10000 + +# press shift arrow + control anywhere, and move the pointer by 1% of a page +Key Left FIRST SC CursorMove -1 0 +Key Right FIRST SC CursorMove +1 +0 +Key Up FIRST SC CursorMove +0 -1 +Key Down FIRST SC CursorMove +0 +1 +Key Left FIRST MS CursorMove -5 0 +Key Right FIRST MS CursorMove +5 0 +Key Up FIRST MS CursorMove +0 -5 +Key Down FIRST MS CursorMove +0 +5 + +# Keyboard accelerators +Key F1 FIRST S Popup "Utilities" +Key F2 FIRST S Popup "Window-Ops" +Key F3 FIRST S Module FvwmWinList +Key F4 FIRST S Iconify +Key F5 FIRST S Move +Key F6 FIRST S Resize +Key F7 FIRST S CirculateUp +Key F8 FIRST S CirculateDown +# Alt+Fx takes us to various pages +Key F1 A M GotoDeskAndPage 0 0 0 +Key F2 A M GotoDeskAndPage 0 1 0 +Key F3 A M GotoDeskAndPage 0 2 0 +Key F4 A M GotoDeskAndPage 0 3 0 +Key F5 A M GotoDeskAndPage 1 0 0 +Key F6 A M GotoDeskAndPage 1 1 0 +Key F7 A M GotoDeskAndPage 1 2 0 +Key F8 A M GotoDeskAndPage 1 3 0 +Key F9 A M GotoDeskAndPage 2 0 0 +Key F10 A M GotoDeskAndPage 2 1 0 +Key F11 A M GotoDeskAndPage 2 2 0 +Key F12 A M GotoDeskAndPage 2 3 0 + +# move to page, Shift+Ctrl+KP_N +Key KP_1 A SC MoveToPage 0 2 +Key KP_2 A SC MoveToPage 1 2 +Key KP_3 A SC MoveToPage 2 2 +Key KP_4 A SC MoveToPage 0 1 +Key KP_5 A SC MoveToPage 1 1 +Key KP_6 A SC MoveToPage 2 1 +Key KP_7 A SC MoveToPage 0 0 +Key KP_8 A SC MoveToPage 1 0 +Key KP_9 A SC MoveToPage 2 0 +Key KP_0 A SC MoveToPage prev + +# move to desk, Shift+Ctrl+N +Key 1 A SC MoveToDesk 0 0 +Key 2 A SC MoveToDesk 0 1 +Key 3 A SC MoveToDesk 0 2 +Key 4 A SC MoveToDesk 0 3 +Key 0 A SC MoveToDesk prev + + + +#Page Up/Dapge Down keys are used to scroll by one desktop page +# in any context, press page up/down + control +# in root context, just pressing page up/down is OK +# +# I prefer the wrapping scroll. +Key Next RD N Scroll 100000 0 +Key Prior RD N Scroll -100000 0 + +# non-iconified windows on the current page of the current desk +Key Next RD S Next [!iconic CurrentScreen CurrentDesk] focus-and-raise +Key Prior RD S Prev [!iconic CurrentScreen CurrentDesk] focus-and-raise + +# non-iconified windows on the current desk +Key Next RD M Next [!iconic CurrentDesk] focus-and-raise +Key Prior RD M Prev [!iconic CurrentDesk] focus-and-raise + +# non-iconified windows +Key Next RD C Next [!iconic] focus-and-raise +Key Prior RD C Prev [!iconic] focus-and-raise + +# any window or icon on the current page of the current desk, +# including those otherwise skipped +Key Next RD MC Next [CurrentScreen CurrentDesk CirculateHit] focus-and-raise +Key Prior RD MC Prev [CurrentScreen CurrentDesk CirculateHit] focus-and-raise + +# any window or icon on the current desk including those otherwise +# skipped +Key Next RD MS Next [CurrentDesk CirculateHit] focus-and-raise +Key Prior RD MS Prev [CurrentDesk CirculateHit] focus-and-raise + +# any window or icon including those otherwise skipped +Key Next RD CS Next [CirculateHit *] focus-and-raise +Key Prior RD CS Prev [CirculateHit *] focus-and-raise + +Key q FIRST M Popup "Quit-Verify" +Key w FIRST M Popup "Window-Ops" +Key g FIRST M Popup "General" +Key m FIRST M Popup "Mod-Popup" +Key u FIRST M Popup "Utilities" + +Key e FIST M Popup "General" +Key r FIRST M Popup "Mod-Popup" +Key t FIRST M Popup "Utilities" + + +#### +# Mouse Gestures. +# +# Syntax reminder: +# +# 1 2 3 +# +# 4 5 6 +# +# 7 8 9 +# +# Stroke Sequence Button Context Modifiers Function +# +# I use mouse gestures in Opera and Mozilla, so I've duplicated some +# common ones here. +# +# To try these out, hold down the Left mouse button and trace the +# pattern on the Root Window, the sequence is a pattern on the grid +# above, so 14789 would be down then Right. +################# +#### +# First, define a StrokeFunc. +# +# Without this, you would have to execute all of your gestures +# entirely on the Root Window, This lets you change the Context and +# have a few other Neat Features, such as DrawMotion, which will draw +# a line as you make your Gesture (Neat!). +# +# There is also EchoSequence, Feedback and NotStayPressed. +# +# Note: EchoSequence prints sequences to STDERR. +################# +# mouse 3 with Control on the root window +Mouse 3 RD C StrokeFunc DrawMotion FeedBack StrokeWidth 2 +# mouse 3 with Alt on a window +Mouse 3 WD M StrokeFunc FeedBack DrawMotion StrokeWidth 2 + +Stroke 0 0 RD A Exec xmessage "Just click mouse 3 on the root" +# Down, Then Up. +Stroke 25852 0 RD A Refresh + +# Directions... +Stroke 456 0 RD A GotoPage +1p 0p +Stroke 654 0 RD A GotoPage -1p 0p +Stroke 852 0 RD A GotoPage 0p -1p +Stroke 258 0 RD A GotoPage 0p +1p + +# Diagonal... +Stroke 159 0 RD A GotoPage +1p +1p +Stroke 951 0 RD A GotoPage -1p -1p +Stroke 357 0 RD A GotoPage -1p +1p +Stroke 753 0 RD A GotoPage +1p -1p + +##### +# Quit +# +# Down, Then Right. +# +# Dont worry about running this gesture by accident, +# you will be asked to confirm +################# +Stroke 14789 0 RD A Module FvwmForm FvwmForm-QuitVerify + +#### +# Up, Then Down: Close a window. +# +# Note that you can also enter the sequence as it appears on your +# Numeric Keypad, by preceding the sequence with an `N`. +# +# The FVWM developers think of everything :) +################# +Stroke N25852 0 RD A Pick Close +# Left, then right opens an uxterm +Stroke 456654 0 RD A Exec exec uxterm -fg $[fg.cs30] -bg $[bg.cs30] + +# Start a Web Browser +Stroke N1478963 0 RD A Exec exec Warp-or-Run-Browser +Stroke 7415963 0 RD A Warp-or-Run-Browser +Stroke 74148963 0 RD A Warp-or-Run-Browser +Stroke 74158963 0 RD A Warp-or-Run-Browser +Stroke 7418963 0 RD A Warp-or-Run-Browser +Stroke 415963 0 RD A Warp-or-Run-Browser + +# Make a new Sticky Note +Stroke N1598753 0 RD A Exec exec xpad + + +# starts the "QuitVerify" form if you draw a box that begins in the +# top left corner. +Stroke N78963214 0 RD A FvwmForm FvwmForm-QuitVerify +Stroke N789632147 0 RD A FvwmForm FvwmForm-QuitVerify + + +# Hey, key strokes in the root window can now mean s'thing! +Key e RD N WindowId emacs 1 WarpToWindow 50 50 + +Key Tab A M WindowList Root c c NoDeskSort +# Key Tab A M WindowList Root c c CurrentDesk NoGeometry + + Key KP_Add A M Next (CurrentDesk !Iconic) Focus + Key KP_Subtract A M Prev (CurrentDesk !Iconic) Focus + +Key F9 RD A Exec "Netscape go" exec mozilla -remote "openURL "`xselection PRIMARY` & +Key F10 RD N FvwmForm FvwmForm-QuitVerify +Key F11 RD C Restart + + +Key Tab A 4 Prev ("CurrentPage" "!Iconic" !"Fvwm*") FocusRaise + + +Key s FIRST CM Exec sleep 15; import -window root /tmp/screenshot.png +Key Tab A M WindowList Root c c NoDeskSort +Key F2 A 4 Maximize grow grow + +# The following binds right shit to launch xterms +#Key Shift_R A A Exec xterm + +Key T A CM Pick ToggleWindowTitle # Ctrl-Alt-T to toggle title + +Key Super_L FISTRD S WindowList (CurrentPage) NoGeometry +Key Super_R FIRST S WindowList Root c c SelectOnRelease "", NoDeskSort +Key Menu FIRST S Menu MenuFvwmRoot +Key N FIRST SC Current Next ($[w.class]) MyFocusAndRaise +Key Tab FIRST M Next (AcceptsFocus, CurrentPage, !Iconic) Focus +Key Tab FIRST SM Prev (AcceptsFocus, CurrentPage, !Iconic) Focus + +# Then press Shift-Ctrl-Alt-1 / 2 / 3 / 4 to bookmark windows (up to 4) +# and Shift-Alt-1 / 2 / 3 / 4 to switch to the bookmarked windows. +Key 1 W SCM Key 1 A SM Silent WindowId $$w SelectWindow +Key 2 W SCM Key 2 A SM Silent WindowId $$w SelectWindow +Key 3 W SCM Key 3 A SM Silent WindowId $$w SelectWindow +Key 4 W SCM Key 4 A SM Silent WindowId $$w SelectWindow + +Key 7 A SCM Key 1 A SC WindowId $[w.id] WindowListFunc +Key 8 A SCM NoWindow Pick Key 1 A SC WindowId $$[w.id] WindowListFunc +Key 9 A SCM Key 9 A SC WindowId $[w.id] WindowListFunc + +# resize a window with the keyboard in small steps. (does not work for xterms) +# Ctrl-Alt-Home works, but not Ctrl-Alt-End. +Key Home A CM Pick PipeRead `echo Resize $(($[cw.width]-1))p $(($[cw.height]-1))p` +Key End A CM Pick PipeRead `echo Resize $(($[cw.width]+1))p $(($[cw.height]+1))p` + +# I use the following setup to not use the mouse. I identify the windows on there +# names. When I press CTRL ALT S fvwm looks for a window with the name MAINscreen. +# If there is on it will be raised and focused. If not the above command will be +# executed. +# Key Q A SC SmartStart GQ "gq" +# Key X A SC Exec exec xterm -T xterm -ls +# Key S A SC SmartStart MAINscreen "xterm -T MAINscreen -ls -e ssh -t $SCREENSERVER /usr/src/tg/screen-3.9.13/screen -x main" +# Key D A SC SmartStart DEVELscreen "xterm -T DEVELscreen -ls -e ssh -t $SCREENSERVER screen -x devel" +# Key L A SC SmartStart LOCALscreen "xterm -T LOCALscreen -ls -e screen -R" +# Key N A SC SmartStart "Netscape:*" $NETSCAPE +# Key O A SC SmartStart "Opera*" $OPERA +# Key B A SC SmartStart "bluescreen" "xterm -T bluescreen -bg \\#${OVERLAYCOLOR} -fg white -ls" +# Key M A SC SmartStart "*Mozilla" $MOZILLA +# Key W A SC SmartStart "faui47" $CITRIX +# Key G A SC SmartStart "*GVIM" $GVIM +# Key C A SC SmartStart CONSOLEscreen "xterm -T CONSOLEscreen -ls -e ssh -t $SCREENSERVER /local/console/bin/cscreen -x" +# Key A A SC SmartStart "*.pdf" +# Key P A SC SmartStart "MPlayer" +# Key U A SC SmartStart "UMLinux" +# Key R A SCM Restart $FVWM +# Key F4 A M Exec exec $XLOCK -mode blank -remote --- fvwm-2.5.27.ds.orig/debian/manoj/headlines +++ fvwm-2.5.27.ds/debian/manoj/headlines @@ -0,0 +1,46 @@ +DestroyFunc FuncFvwmMenuHeadlines +AddToFunc FuncFvwmMenuHeadlines ++ I PipeRead "fvwm-menu-headlines --frontpage --wm-icons --site $0 --command='Exec mozilla -remote \"openURL(%u, new-tab)\"'" +DestroyMenu MenuFvwmHeadlines +AddToMenu MenuFvwmHeadlines "Headlines" Title ++ MissingSubmenuFunction FuncFvwmMenuHeadlines ++ "FreshMeat" Popup freshmeat ++ "LinuxToday" Popup linuxtoday ++ "Slashdot" Popup slashdot ++ "LinuxApps" Popup linuxapps ++ "DaemonNews" Popup daemonnews +#+ "GNOME News" Popup gnome-news +#+ "KDE News" Popup kde-news +#+ "RootPrompt" Popup rootprompt ++ "NewsForge" Popup newsforge ++ "Kuro5hin" Popup kuro5hin ++ "BBSpot" Popup bbspot +#+ "LinuxFr" Popup linuxfr ++ "ThinkGeek" Popup thinkgeek ++ "" Nop ++ "CNN" Popup cnn ++ "BBC-World" Popup bbc-world +#+ "BBC-SciTech" Popup bbc-scitech ++ "" Nop ++ "" Nop +#+ "Reset all" FuncFvwmResetHeadlines + +DestroyFunc FuncFvwmResetHeadlines +AddToFunc FuncFvwmResetHeadlines ++ I DestroyMenu freshmeat ++ I DestroyMenu linuxtoday ++ I DestroyMenu slashdot ++ I DestroyMenu linuxapps ++ I DestroyMenu daemonnews ++ I DestroyMenu gnome-news ++ I DestroyMenu kde-news ++ I DestroyMenu rootprompt ++ I DestroyMenu newsforge ++ I DestroyMenu kuro5hin ++ I DestroyMenu bbspot ++ I DestroyMenu linuxfr ++ I DestroyMenu thinkgeek ++ I DestroyMenu cnn ++ I DestroyMenu bbc-world ++ I DestroyMenu bbc-scitech + --- fvwm-2.5.27.ds.orig/debian/manoj/init-restart.hook +++ fvwm-2.5.27.ds/debian/manoj/init-restart.hook @@ -0,0 +1,30 @@ +# +# Section: Init and restart functions +# +# This section defines the functions InitFunction and RestartFunction. +# InitFunction is executed automatically when fvwm first starts. +# RestartFunction is executed automatically when fvwm restarts itself. +# They share a common hook, init-restart.hook, and two specific hooks, +# init.hook and restart.hook. +# +# init-restart.hook should be used for starting fvwm modules, such as the +# button bar. init-hook should be used to start other applications; they +# should not be started again, when fvwm is restarted, since they don't +# die like fvwm modules do. restart.hook exists mostly for completeness; +# tell me if you find any use for it. +# +# InitFunction runs the script setup-background, which looks in +# ~/.fvwm2 to see if the user wants some specific background color or +# image. +# +#===================================================== 8. Special functions +# 8. Special functions ++ I Module FvwmButtons ++ I Module FvwmBacker ++ I Module FvwmCommandS ++ I Module FvwmAnimate + +#+ "I" Exec nice xdaliclock -geometry 300x100-55-60 -cycle -shape \ +# -memory high -noseconds -visual TrueColor & +#+ "I" Exec nice xticktalk -before -approximate -geometry +1+1 \ +# -fn '-adobe-times-bold-r-*-*-24-*-*-*-*-*-*-*' & --- fvwm-2.5.27.ds.orig/debian/manoj/m4menus.hook +++ fvwm-2.5.27.ds/debian/manoj/m4menus.hook @@ -0,0 +1,52 @@ +#===================================================== 1. M4 macros +# 1. M4 macros + +undefine('include') +changequote({[,]}) +define(stripquote, {[substr(substr($1,1), 0, index(substr($1,1),'))]}) +define(XSIZE, ifelse(CLIENTHOST, `calidity', 12, CLIENTHOST, `glaurung', 16, 16))dnl +define(YSIZE, ifelse(CLIENTHOST, `calidity', 9, CLIENTHOST, `glaurung', 12, 12))dnl + +define(XPIX, eval(stripquote(WIDTH) / XSIZE))dnl +define(YPIX, eval(stripquote(HEIGHT) / YSIZE))dnl + +define(xsize, {[eval((1000 * $1 / stripquote(WIDTH) + 5) / 10)]}) +AddToMenu "m4-Settings" "M4 Settings for fvwm FVWM_VERSION" Title ++ "{[TWM_TYPE=]}TWM_TYPE" Nop ++ "{[FVWM_VERSION=]}FVWM_VERSION" Nop ++ "{[FVWMDIR=]}FVWMDIR" Nop ++ "{[CMD_OPTIONS=]}CMD_OPTIONS" Nop ++ "{[FVWM_MODULEDIR=]}FVWM_MODULEDIR" Nop ++ "{[FVWM_USERDIR=]}FVWM_USERDIR" Nop ++ "Hosts Info" Title ++ "{[SERVERHOST=]}SERVERHOST" Nop ++ "{[CLIENTHOST=]}CLIENTHOST" Nop ++ "{[HOSTNAME=]}HOSTNAME" Nop ++ "{[OSTYPE=]}OSTYPE" Nop ++ "{[SESSION_MANAGER=]}SESSION_MANAGER" Nop ++ "User Info" Title ++ "{[USER=]}USER" Nop ++ "{[HOME=]}HOME" Nop ++ "Vendor Info" Title ++ "{[VENDOR=]}VENDOR" Nop ++ "{[VERSION=]}VERSION" Nop ++ "{[RELEASE=]}RELEASE" Nop ++ "{[REVISION=]}REVISION" Nop ++ "{[OPTIONS=]}OPTIONS" Nop ++ "Screen Size and resolution" Title ++ "{[WIDTH=]}WIDTH" Nop ++ "{[HEIGHT=]}HEIGHT" Nop ++ "{[X_RESOLUTION=]}X_RESOLUTION" Nop ++ "{[Y_RESOLUTION=]}Y_RESOLUTION" Nop ++ "{[XSIZE=]}XSIZE" Nop ++ "{[YSIZE=]}YSIZE" Nop ++ "{[XPIX=]}XPIX" Nop ++ "{[YPIX=]}YPIX" Nop ++ "Color and stuff" Title ++ "{[CLASS=]}CLASS" Nop ++ "{[COLOR=]}COLOR" Nop ++ "{[PLANES=]}PLANES" Nop ++ "{[BITS_PER_RGB=]}BITS_PER_RGB" Nop + + + --- fvwm-2.5.27.ds.orig/debian/manoj/pre.hook +++ fvwm-2.5.27.ds/debian/manoj/pre.hook @@ -0,0 +1,209 @@ + +#===================================================== 2. Fonts +# 2. Fonts +# Now the fonts - one for menus, another for window titles, another +# for icons changing the title font automatically adjusts the title +# bar height. +# !Font -*-times-medium-i-*-*-*-120-*-*-*-*-*-* (new command=MenuStyle) +# WindowFont -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-* +# !PagerFont -*-times-medium-r-*-*-*-80-*-*-*-*-*-* (use FvwmPager module) +IconFont fixed + + + +#===================================================== 3. paths +# 3. Module path and paths to the icons +# +# ModulePath is a colon-separated list, just like regular unix PATH +# Set the directories to look in for Image files. +ImagePath /usr/share/icons:/usr/share/pixmaps:/usr/share/icons/wm-icons +ImagePath +:/usr/X11R6/include/X11/pixmaps/:/usr/X11R6/include/X11/bitmaps/ +ImagePath +:/usr/include/X11/bitmaps/:/usr/local/include/pixmaps/ +ImagePath +:/usr/local/graphics/xpm/fvwm:/usr/local/graphics/xpm/ +ImagePath +:/usr/local/graphics/xpm/3d_pixmaps_1.0/3dpixmaps/ +ImagePath +:/usr/local/include/bitmaps/:/usr/local/graphics/images/xpm + + +##### +# You can set simple options like this, using variables. +# If you need something more complex, read the man pages for FvwmCPP, +# FvwmM4 or FvwmPerl. +################# +SetEnv fvwm_video_path $[HOME]/media/video +SetEnv fvwm_video_exec xine + +SetEnv fvwm_audio_path $[HOME]/media/audio +SetEnv fvwm_audio_exec "alsaplayer -l 90" + +SetEnv fvwm_image_path $[HOME]/media/images +SetEnv fvwm_image_exec display + +SetEnv fvwm_rom_path $[HOME]/lib/ +SetEnv fvwm_rom_exec + +SetEnv fvwm_wallpaper_dir $[fvwm_image_path]/wallpaper +SetEnv fvwm_wallpaper0 $[fvwm_wallpaper_dir]/gothic-angel.png +SetEnv fvwm_wallpaper1 $[fvwm_wallpaper_dir]/insodus.png + +##### +# If you use Thumbnails, how big would you like the Icons to be? +# Try one of these, from tiny to large: 32, 64, 96, 128 +################# +SetEnv fvwm_icon_size 64 + + + +# +# Section: Various global settings +# +# These settings are personal. If you need to modify them, do so in post.hook. +# +# +# DeskTopSize sets the size of the desktop in units of physical screen +# `pages'. I prefer to use separate desktops instead of pages, but +# many reasonable people do it the other way. My reason is that this +# makes it possible to have different backgrounds when changing the +# workspace. +# + +##### +# http://www.fvwm.org/documentation/faq/#5.5 +################# +IgnoreModifiers L25 + +#===================================================== 5. miscellaneous +# 5. miscellaneous +# EdgeScroll horizontal vertical +# Sets the percentage of a page to scroll when the cursor is on the edge +# of the screen. +# flip by whole pages on the edge of the screen. +EdgeScroll 100 100 + +##### +# You can automatically move the viewport into adjacent pages when the pointer +# hits the screen edge, + +# EdgeResistance scrolling moving +# Sets how hard it is to change the desktop viewport +# scrolling is in milliseconds +# moving is in pixels (how far a window's edge must move to move off-screen +# +# A modest delay before flipping pages seems to be nice... +# I thresh in a 50 pixel Move-resistance too, just so people +# can try it out. +EdgeResistance 250 50 + +# EdgeThickness controls edge scrolling and EdgeCommand. Set the +# thickness of the edge to 2 +EdgeThickness 2 + +# OpaqueMoveSize percentage +# OpaqueMoveSize allows you to stop Large windows from being moved opaquely +# This option tells fvwm the maximum size window that it should move +# with contents intact (ie, not 'rubber-banding') You should keep this +# low if you don't have good video hardware. +# if the window occupies less than N% of the screen, +# then opaque move is used. 0 <= N <= 100 +OpaqueMoveSize 50 + +# SnapAttraction lets nearby windows snap together, or snap to edges so that they +# are easier to align on your desktop, The default is off, if you set it too large +# it's annoying as hell, +# Make our windows snap-up against other windows and make icons snap +# up against other icons +SnapAttraction 20 SameType + + +##### +# Set up the virtual desktop and pager +# +# Desktop [Horizontal]x[vertical] Defines the virtual desktop size, +# 1x1 = one physical screen size (no virtual desktop +# Use 4 pages per desktop, arranged in a square, like this: +# +# +-----+-----+ +# | | | +# +-----+-----+ +# | | | +# +-----+-----+ +################# +DeskTopSize 2x2 +# for pager in bottom right +#! PagerBackColor SlateGrey (use FvwmPager module) +#! PagerForeColor SlateBlue4 (use FvwmPager module) + +## +# set XORvalue to something visible. This sets the coloration of the +# 'rubber-band' window-borders when moving and resizing windows. +XORvalue 16777215 # (It's the decimal equivalent of 0xffffff.) +#XORvalue 3772 # Rubberbands swap 3 lsbs +#TitleStyle raised + +###### +# Fvwm uses a default ClickTime of 150ms, which is way too short for me. +# A Click that lasts <= ClickTime is considered a `Click` in functions, +# > ClickTime is a `Hold`. +################# +# ClickTime 550 + +# +EwmhBaseStruts 0 100 0 0 + + +###### +# Use an arrow rather than the `X` cursor on the root window. +################# +# CursorStyle root top_left_arrow + +# Set up the cursors (Cursor command withdrawn) +# Cursor 0 # Position +#Cursor 1 132 # Title top_left_arrow +#Cursor 3 60 # buttons hand_2 +#Cursor 4 142 # move trek +#Cursor 5 150 # wait watch +#Cursor 6 110 # menu sb_left_arrow +#Cursor 7 38 # select dot +#Cursor 8 88 # destroy pirate + +######################## ICON STUFF ############################## +# Auto Place Icons is a nice feature.... +# Area of screen where icons are dumped (left top right bottom) +# First go along RHS... +# Style "*" IconBox -100 +140 -1 -40 +# ...next go along the bottom: +#! IconBox +10 -40 +828 -1 (multiple iconboxes no longer possible) + + + +# +# Section: Init and restart functions +# +#===================================================== 8. Special functions +# 8. Special functions +# Stuff to do at start-up + + +DestroyMenu StartFunction +AddToFunc StartFunction +Read init.hook +Read init-restart.hook +Read restart.hook + + +AddToFunc StartFunction ++ I Module FvwmEvent ++ I Module FvwmCommandS + +ModuleSynchronous FvwmM4 -lock screendiffs.hook + +DestroyFunc SessionInitFunction +AddToFunc SessionInitFunction ++ I Module FvwmBanner + +DestroyFunc SessionRestartFunction +AddToFunc SessionRestartFunction ++ I Nop + +DesktopName 0 Work +DesktopName 1 Personal + --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-Form +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-Form @@ -0,0 +1,97 @@ +# -*- Mode: fvwm -*- +DestroyModuleConfig FvwmForm-Form: * +*FvwmForm-Form: WarpPointer +*FvwmForm-Form: Line center +*FvwmForm-Form: Text "FvwmForm Set Form Defaults:" +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "" +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Font for text: " +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Font for input: " +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Font for button:" +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Color of text f/g: " +*FvwmForm-Form: Input Fore 15 "Wheat" +*FvwmForm-Form: Text "b/g:" +*FvwmForm-Form: Input Back 15 "Gray50" +*FvwmForm-Form: Text "colorset:" +*FvwmForm-Form: Input Colorset 5 "-1" +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Color of buttons f/g:" +*FvwmForm-Form: Input ItemFore 15 "Black" +*FvwmForm-Form: Text "b/g:" +*FvwmForm-Form: Input ItemBack 15 "Light Gray" +*FvwmForm-Form: Text "colorset:" +*FvwmForm-Form: Input ItemColorset 5 "-1" + +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Pointer over button: " +*FvwmForm-Form: Input ButtonPointer 20 "hand2" +*FvwmForm-Form: Text "f/g" +*FvwmForm-Form: Input ButtonPointerFore 20 "white" +*FvwmForm-Form: Text "b/g" +*FvwmForm-Form: Input ButtonPointerBack 20 "black" + +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Pointer while button in:" +*FvwmForm-Form: Input ButtonInPointer 20 "hand2" +*FvwmForm-Form: Text "f/g" +*FvwmForm-Form: Input ButtonInPointerFore 20 "black" +*FvwmForm-Form: Text "b/g" +*FvwmForm-Form: Input ButtonInPointerBack 20 "white" +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Pointer over input: " +*FvwmForm-Form: Input InputPointer 20 "xterm" +*FvwmForm-Form: Text "f/g" +*FvwmForm-Form: Input InputPointerFore 20 "white" +*FvwmForm-Form: Text "b/g" +*FvwmForm-Form: Input InputPointerBack 20 "black" + +*FvwmForm-Form: Line left +*FvwmForm-Form: Text "Activate buttons:" +*FvwmForm-Form: Selection ActivateOnPress single +*FvwmForm-Form: Choice OnRelease off off " on release (default)" +*FvwmForm-Form: Choice OnPress on on " on press" + +*FvwmForm-Form: Line left +*FvwmForm-Form: Message +*FvwmForm-Form: Line expand +*FvwmForm-Form: Button quit "F1 - Save & Restart This Form" F1 +*FvwmForm-Form: Command DestroyModuleConfig FvwmFormDefault: * +# Caution, this command is getting too long, if you add something, +# you might have some truncation occur: +*FvwmForm-Form: Command !(/bin/echo \ + "# This file last created by FvwmForm-Form on: `/bin/date`."; /bin/echo \ + '*FvwmFormDefault: Font $(Font)' ; /bin/echo \ + '*FvwmFormDefault: InputFont $(InputFont)' ; /bin/echo \ + '*FvwmFormDefault: ButtonFont $(ButtonFont)'; /bin/echo \ + '*FvwmFormDefault: Fore $(Fore)' ; /bin/echo \ + '*FvwmFormDefault: Back $(Back)' ; /bin/echo \ + '*FvwmFormDefault: Colorset $(Colorset)' ; /bin/echo \ + '*FvwmFormDefault: ItemFore $(ItemFore)' ; /bin/echo \ + '*FvwmFormDefault: ItemBack $(ItemBack)' ; /bin/echo \ + '*FvwmFormDefault: ItemColorset $(ItemColorset)' ; /bin/echo \ + '*FvwmFormDefault: ButtonPointer $(ButtonPointer)' ; /bin/echo \ + '*FvwmFormDefault: ButtonInPointer $(ButtonInPointer)' ; /bin/echo \ + '*FvwmFormDefault: InputPointer $(InputPointer)' ; /bin/echo \ + '*FvwmFormDefault: ActivateOnPress $(ActivateOnPress)'\ +) > ${FVWM_USERDIR}/.FvwmForm +# This would have surely hit a limit so its appended with >>: +*FvwmForm-Form: Command !(\ + /bin/echo '*FvwmFormDefault: ButtonPointerFore $(ButtonPointerFore)';\ + /bin/echo '*FvwmFormDefault: ButtonPointerBack $(ButtonPointerBack)';\ + /bin/echo '*FvwmFormDefault: ButtonInPointerFore $(ButtonInPointerFore)';\ + /bin/echo '*FvwmFormDefault: ButtonInPointerBack $(ButtonInPointerBack)';\ + /bin/echo '*FvwmFormDefault: InputPointerFore $(InputPointerFore)';\ + /bin/echo '*FvwmFormDefault: InputPointerBack $(InputPointerBack)';\ +) >> ${FVWM_USERDIR}/.FvwmForm + +*FvwmForm-Form: Command *FvwmFormDefault: Read n +*FvwmForm-Form: Command Module FvwmForm FvwmForm-Form +*FvwmForm-Form: Button restart "F3 - Reset" F3 +*FvwmForm-Form: Button quit "F4 - Dismiss" F4 +*FvwmForm-Form: Command Nop +# Tell FvwmForm to read and save vars from the .FvwmForm file. +*FvwmForm-Form: UseData .FvwmForm *FvwmFormDefault --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-Setup +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-Setup @@ -0,0 +1,67 @@ +# FvwmForm-Setup - Setup Text for fvwm +# Caution, during install, this file goes thru sed, a trailing newline +# is required. +DestroyModuleConfig FvwmForm-Setup: * +*FvwmForm-Setup: WarpPointer +# Layout +*FvwmForm-Setup: Line center +*FvwmForm-Setup: Text "fvwm - Create Configuration" +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text " " +*FvwmForm-Setup: Line left +*FvwmForm-Setup: PadVText 0 +*FvwmForm-Setup: Text "Use this form to create your fvwm2rc configuration file." +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "The file created is ~/.fvwm/.fvwm2rc or $FVWM_USERDIR/.fvwm2rc." +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "" +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "After creation, the fvwm2rc file can then be changed with any" +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "editor to suit your own needs." +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "" +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Selection meth multiple +*FvwmForm-Setup: Choice BASIC BASIC on "Create a starting .fvwm2rc file" +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "" +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "These files are optional. Select the modules you want to customize." +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "You can always copy them later." +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Text "" +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Selection meth multiple +*FvwmForm-Setup: Choice BAK BAK off "FvwmBacker " +*FvwmForm-Setup: Choice BUT BUT off "FvwmButtons " +*FvwmForm-Setup: Choice BOX BOX off "FvwmIconBox " +*FvwmForm-Setup: Choice MAN MAN off "FvwmIconMan " +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Selection meth multiple +*FvwmForm-Setup: Choice IDN IDN off "FvwmIdent " +*FvwmForm-Setup: Choice PAG PAG off "FvwmPager " +*FvwmForm-Setup: Choice SCR SCR off "FvwmScroll " +*FvwmForm-Setup: Choice TSK TSK off "FvwmTaskBar " +*FvwmForm-Setup: Line left +*FvwmForm-Setup: Selection meth multiple +*FvwmForm-Setup: Choice WIN WIN off "FvwmWinList " + +# Buttons +*FvwmForm-Setup: Line center +*FvwmForm-Setup: Button quit "Return - Dismiss" ^M +*FvwmForm-Setup: Command Nop +*FvwmForm-Setup: Button continue "F2 - Copy Config File(s)" F2 +*FvwmForm-Setup: Command $(BASIC?!/bin/cp /usr/share/fvwm/ConfigFvwmSetup ${FVWM_USERDIR}/.fvwm2rc) +*FvwmForm-Setup: Command $(BAK?!/bin/cp /usr/share/fvwm/ConfigFvwmBacker ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(BUT?!/bin/cp /usr/share/fvwm/ConfigFvwmButtons ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(BOX?!/bin/cp /usr/share/fvwm/ConfigFvwmIconBox ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(MAN?!/bin/cp /usr/share/fvwm/ConfigFvwmIconMan ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(IDN?!/bin/cp /usr/share/fvwm/ConfigFvwmIdent ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(PAG?!/bin/cp /usr/share/fvwm/ConfigFvwmPager ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(SCR?!/bin/cp /usr/share/fvwm/ConfigFvwmScroll ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(TSK?!/bin/cp /usr/share/fvwm/ConfigFvwmTaskBar ${FVWM_USERDIR}) +*FvwmForm-Setup: Command $(WIN?!/bin/cp /usr/share/fvwm/ConfigFvwmWinList ${FVWM_USERDIR}) +*FvwmForm-Setup: Button quit "F3 - Restart fvwm" +*FvwmForm-Setup: Command Restart --- fvwm-2.5.27.ds.orig/debian/manoj/buttons.hook +++ fvwm-2.5.27.ds/debian/manoj/buttons.hook @@ -0,0 +1,110 @@ + +#===================================================== B. titlebar buttons +# B. titlebar buttons +# When the Buttons are ActiveDown (Pressed), The shadow vector is not drawn. +# +# Note that some Title/Button Styles are destructive. +# +# Active Window TitleBar has a Vertical Gradient of White (at the top) to +# Black at the bottom where the buttons are, and a gradient of Blue to black over +# the title, using 16 shades (one for each pixel, so looks like a nice, smooth transition). +# +# Inactive uses a tinted transparent colorset, with white text and buttons. +# +# Vectors are basically just a set of co-ordinates, each button is a grid of 100x100 points +# (or you can use pixels..it's up to you), following each vector you must specify a line type: +# +# @0 Shadow (sh) +# @1 Hilight (hi) +# @2 Background (bg) +# @3 Foreground (fg) +# @4 Invisible (just move the pointer, dont draw anything) +# +# +# begin 644 title_back.png +# MB5!.1PT*&@H````-24A$4@````$````1"`8````3````"7!(67,```L3```+$P$`FIP8````!W1)344'U`,7##(;H1J% +# ME@```!UT15AT0V]M;65N=`!#3````"7!(67,```L3```+$P$`FIP8````!W1)344'U`,7##4`9#[: +# MO0```!UT15AT0V]M;65N=`!#(`(P#7O$CI!U5BA4`````245.1*Y"8((` +# ` +# end +# +# man uudecode if you're not sure what to do with these :) +# +# If you would like an example of a TitleBar gradient: +# TitleStyle Active ( VGradient 16 1 #5a8ade 50 #000000 -- Flat ) +# +# More complex styles can be achieved using the MultiPixmap feature, see the +# man page for details. +# +# ButtonStyle and TitleStyle are destructive, ie all other TitleStyles +# before them will get overridden. +# +# AddButtonStyle and AddTitleStyle are not destructive (mostly), so you can +# stack multiple styles (pixmaps, vectors, etc) on top of each other to make +# some nice effects. +# +# Title bar Buttons can also be MiniIcons, this can look nice, there +# is an example below commented out. + +# Change the Maximize and iconify buttons to up and down triangles. + +# double headed arrow (i use it to maximise window vertically) +ButtonStyle 3 11 30x30@1 50x10@1 70x30@0 55x30@0 55x70@0 70x70@1 50x90@0 30x70@0 45x70@1 45x30@1 30x30@0 + +# double headed arrow sideways +ButtonStyle 5 11 30x30@1 10x50@1 30x70@0 30x55@0 70x55@0 70x70@1 90x50@0 70x30@0 70x45@1 30x45@1 30x30@0 + +# double headed arrow diagonally +ButtonStyle 7 11 10x10@1 40x10@1 25x20@0 80x70@1 90x60@1 90x85@0 60x85@0 70x75@1 20x30@0 10x40@0 10x10@1 + +# resize +ButtonStyle 9 13 10x0@1 80x0@1 80x10@1 80x80@0 0x80@0 0x60@1 10x65@1 70x65@0 70x0@0 55x0@1 55x10@1 55x55@0 10x55@0 + + +# An X shaped button +#ButtonStyle 2 13 26x29@1 34x21@1 50x35@1 70x21@1 79x29@1 63x48@0 79x65@1 70x75@0 50x61@0 34x75@0 26x65@0 44x48@1 26x29@0 +# Another X shaped Button +ButtonStyle 2 16 20x20@1 30x20@1 50x40@1 70x20@1 80x20@1 80x30@0 60x50@0 80x70@0 80x80@0 70x80@0 50x60@0 30x80@0 20x80@0 20x70@0 40x50@1 20x30@1 + +# Iconify square (big box cross by an arrow to a little box in the +# opposite colour) +ButtonStyle 4 14 20x20@1 20x70@1 70x70@0 70x20@0 20x20@1 60x60@0 60x50@0 60x60@0 50x60@0 60x60@0 60x80@0 80x80@0 80x60@0 60x60@0 + +# Lower window +ButtonStyle 6 Vector 10 45x65@2 45x75@0 20x75@0 20x50@1 45x50@1 45x65@0 75x65@3 75x25@3 35x25@3 35x47@3 + +# Shade button +ButtonStyle 8 5 25x45@1 75x45@1 75x55@1 25x55@0 25x45@1 +#AddButtonStyle 8 Active Vector 9 40x40@2 45x35@2 55x35@2 60x40@2 60x45@2 50x50@2 50x55@2 50x65@4 50x65@2 -- Flat +#AddButtonStyle 8 InActive Vector 9 40x40@3 45x35@3 55x35@3 60x40@3 60x45@3 50x50@3 50x55@3 50x65@4 50x65@3 -- Flat +#AddButtonStyle 8 AllUp Vector 7 40x45@1 45x40@1 55x40@1 60x50@4 50x60@1 50x75@4 50x75@1 -- Flat +#AddButtonStyle All Active Vector 9 80x60@4 80x40@2 60x20@2 40x20@2 20x40@2 20x60@2 40x80@2 60x80@2 80x60@2 -- Flat +#AddButtonStyle All Inactive Vector 9 80x60@4 80x40@2 60x20@2 40x20@2 20x40@2 20x60@2 40x80@2 60x80@2 80x60@2 -- Flat + +# Stick button +ButtonStyle 0 12 10x23@0 90x23@0 90x28@0 10x28@1 10x47@1 90x47@0 90x52@0 10x52@1 10x70@2 90x70@0 90x76@0 10x76@1 + +# up triangles +# ButtonStyle 8 4 50x35@1 65x65@0 35x65@0 50x35@1 +# ButtonStyle 8 Vector 4 50x30@1 70x70@0 30x70@0 50x30@1 +# down triangle +# ButtonStyle 6 4 50x65@1 35x35@1 65x35@1 50x65@0 +# Raise window +# ButtonStyle 8 Vector 10 45x65@2 45x75@3 20x75@3 20x50@3 35x50@3 35x65@1 35x25@1 75x25@1 75x65@0 35x65@0 + +# These two vectors draw a circle around the vectors above, uncomment +# them and see what you think. +#+ AddButtonStyle All Active Vector 9 80x60@4 80x40@2 60x20@2 40x20@2 20x40@2 20x60@2 40x80@2 60x80@2 80x60@2 -- Flat +#+ AddButtonStyle All Inactive Vector 9 80x60@4 80x40@2 60x20@2 40x20@2 20x40@2 20x60@2 40x80@2 60x80@2 80x60@2 -- Flat + --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-Talk +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-Talk @@ -0,0 +1,22 @@ +# FvwmForm-Talk - Basic replacement for FvwmTalk +DestroyModuleConfig FvwmForm-Talk: * +*FvwmForm-Talk: WarpPointer +# Layout +*FvwmForm-Talk: Line center +*FvwmForm-Talk: Text "Talk to Fvwm" +*FvwmForm-Talk: Line left +*FvwmForm-Talk: Text "Command:" +*FvwmForm-Talk: Input Command 80 "" +*FvwmForm-Talk: Line left +*FvwmForm-Talk: Text "Msg:" +*FvwmForm-Talk: Message +*FvwmForm-Talk: Line center +# Buttons +*FvwmForm-Talk: Button restart "Return - Execute" ^M +*FvwmForm-Talk: Command $(Command) +*FvwmForm-Talk: Button continue "F1 - Help" F1 +*FvwmForm-Talk: Command Module FvwmForm FvwmForm-TalkHelp +*FvwmForm-Talk: Button restart "F3 - Reset input" F3 +*FvwmForm-Talk: Command Nop +*FvwmForm-Talk: Button quit "F4 - Dismiss" F4 +*FvwmForm-Talk: Command Nop --- fvwm-2.5.27.ds.orig/debian/manoj/.FvwmAnimate +++ fvwm-2.5.27.ds/debian/manoj/.FvwmAnimate @@ -0,0 +1,7 @@ +# This file created by FvwmAnimate + +*FvwmAnimate: Effect Random +*FvwmAnimate: Iterations 12 +*FvwmAnimate: Width 4 +*FvwmAnimate: Twist 0.500000 +*FvwmAnimate: Delay 10 --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-QuitVerify +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-QuitVerify @@ -0,0 +1,13 @@ +DestroyModuleConfig FvwmForm-QuitVerify: * +*FvwmForm-QuitVerify: GrabServer +*FvwmForm-QuitVerify: WarpPointer +*FvwmForm-QuitVerify: Command Beep +*FvwmForm-QuitVerify: Line center +*FvwmForm-QuitVerify: Text "Do you really want to logout?" +*FvwmForm-QuitVerify: Line expand +*FvwmForm-QuitVerify: Button quit "Logout" ^M +*FvwmForm-QuitVerify: Command Quit +*FvwmForm-QuitVerify: Button restart "Restart" ^R +*FvwmForm-QuitVerify: Command Restart +*FvwmForm-QuitVerify: Button quit "Cancel" ^[ +*FvwmForm-QuitVerify: Command Nop --- fvwm-2.5.27.ds.orig/debian/manoj/README +++ fvwm-2.5.27.ds/debian/manoj/README @@ -0,0 +1,12 @@ +This is complete working setup that I use (it may not be as pretty as +some, but it demonstrates most of the common techniques used in fvwm, +and has a working themable colorset setup. + +The wall paper was taken from the GPL's enlightment theme found at +http://download.freshmeat.net/themes/darkalloy/, and the icons are +mostly from the package wm-icons. + +Manoj Srivastava + +Copyright (c) 2004 Manoj Srivastava, and distributed under the terms +of the GNU General Public License, version 2. --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmModules.hook +++ fvwm-2.5.27.ds/debian/manoj/FvwmModules.hook @@ -0,0 +1,395 @@ +#_____________________________________________________ E.2 No Clutter +# E.2 No Clutter +# I only wrote NoClutter as a simple test case, but maybe some big +# sites like universities really have usage problems (too many open +# windows).... Time delays are in seconds. +*FvwmNoClutter 3600 Iconify 1 +*FvwmNoClutter 86400 Delete +*FvwmNoCLutter 172800 Destroy +#_____________________________________________________ E.3 Window-Id +# Window-Identifier +# Just choose colors and a fonts + +#_____________________________________________________ E.4 Pager +# E.4 Pager + +# At some point, this shall give the pager transparency +#*FvwmPager: Colorset * 5 + +#*FvwmPager: Colorset 0 14 +#*FvwmPager: Colorset 1 10 +#*FvwmPager: HilightColorset 0 15 +#*FvwmPager: HilightColorset 1 11 +#*FvwmPager: BalloonColorset * 16 +#*FvwmPager: WindowColorsets 1 2 + + +*FvwmPager: Pixmap none + +# Tells FvwmPager to not show the windows that are using the WindowListSkip style. +*FvwmPager: UseSkipList + +*FvwmPager: Window3DBorders +*FvwmPager: Balloons +*FvwmPager: SloppyFocus + +*FvwmPagerGeometry x78-83-1 +*FvwmPager: MiniIcons + +#_____________________________________________________ E.5 FvwmWinList +# E.5 FvwmWinList +*FvwmWinList: FocusColorset 18 +*FvwmWinList: Colorset 17 +*FvwmWinList: IconColorset 19 + +*FvwmWinListAction Click1 Iconify -1,Focus +*FvwmWinListAction Click2 Iconify +*FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent +*FvwmWinListUseSkipList +*FvwmWinListGeometry +0-1 +*FvwmWinListUseIconNames +#_____________________________________________________ E.6 IconBox +# E.6 FvwmIconBox +# Make no icon to be shown in root window +# by spcifying in your .fvwmrc +# (1) "SuppressIcons" if PRUNE is defined in configure.h, or +# This gets rid of the icon's above the titles. +# If you uncomment this, and make sure that the WindowList is bound to +# something, it works pretty much like an icon manager. +##SuppressIcons +#Style "*" NoIcon + + +#*FvwmIconBox: Colorset 12 +#*FvwmIconBox: IconColorset 19 +#*FvwmIconBox: IconHiColorset 20 + + +*FvwmIconBoxGeometry 5x1+0+0 +*FvwmIconBoxMaxIconSize 64x38 +*FvwmIconBoxSortIcons +*FvwmIconBoxPadding 4 +*FvwmIconBoxLines 10 +*FvwmIconBoxPlacement Left Top +*FvwmIconBoxPixmap fvwm.xpm +#*FvwmIconBoxHideSC Horizontal +# +# mouse bindings +# +*FvwmIconBoxMouse 1 Click RaiseLower +*FvwmIconBoxMouse 1 DoubleClick Iconify +*FvwmIconBoxMouse 2 Click Iconify -1, Focus +*FvwmIconBoxMouse 3 Click Module "FvwmIdent" FvwmIdent +# +# Key bindings +# +*FvwmIconBoxKey r RaiseLower +*FvwmIconBoxKey space Iconify +*FvwmIconBoxKey d Close +# +# FvwmIconBox built-in functions +# +*FvwmIconBoxKey n Next +*FvwmIconBoxKey p Prev +*FvwmIconBoxKey h Left +*FvwmIconBoxKey j Down +*FvwmIconBoxKey k Up +*FvwmIconBoxKey l Right +# +# Icon file spcifications +# +*FvwmIconBox "*" unknown1.xpm +*FvwmIconBox "Fvwm*" - +*FvwmIconBox "FvwmFileMgr" folder2.xpm +*FvwmIconBox "rxvt" term.xpm +*FvwmIconBox "xterm" xterm.xpm +*FvwmIconBox "editres" editres.xpm +*FvwmIconBox "xman" xman.xpm +*FvwmIconBox "xbiff" mail1.xpm +*FvwmIconBox "xmh" mail1.xpm +*FvwmIconBox "xcalc" xcalc.xpm +*FvwmIconBox "FvwmButtons" toolbox.xpm + +#_____________________________________________________ E.7 Backer +# E.7 FvwmBacker -- Set Up Backgrounds for different desktops. +# FvwmBacker can change wallpaper as you change desks or pages, or execute commands. +DestroyModuleConfig FvwmBacker: * + +# *FvwmBacker: Command (Page 2 *) -solid steelblue +# *FvwmBacker: Command (Desk 0, Page 0 0) Exec xpmroot $[HOME]/bg2.xpm +# *FvwmBacker: Command (Desk 0, Page 0 1) -solid midnightblue +# *FvwmBacker: Command (Desk 0, Page 1 *) -solid yellow +# *FvwmBacker: Command (Desk 1, Page * 0) -solid navy +# *FvwmBacker: Command (Desk 1, Page * 1) Colorset 5 + +*FvwmBacker: Command (Desk 0) Exec fvwm-root -r $[fvwm_wallpaper0] +*FvwmBacker: Command (Desk 1) Exec fvwm-root -r $[fvwm_wallpaper1] + +#*FvwmBacker: Command (Desk 0) Exec xsetbg -fullscreen $[fvwm_wallpaper0] +#*FvwmBacker: Command (Desk 1) Exec xsetbg -fullscreen $[fvwm_wallpaper1] + +#*FvwmBacker: Command (Desk 0) -solid Black +#*FvwmBacker: Command (Desk 1) -solid midnightblue + +#maybe this works? +#*FvwmWinListDesk 0 -solid steelblue +#*FvwmWinListDesk 1 -solid midnightblue +#*FvwmWinListDesk 2 -solid navy +#*FvwmWinListDesk 3 -solid lightslateblue + +# One other quick comment/question. I got quite sick of using the backer +# because the colors of the desktop didn't show up in the pager. so i set up +# a bunch of symbolic links (FvwmButtons to PagerButtons and FvwmPager to +# IncPager*). then i set the background colors of each one to be the same as +# the FvwmBacker colors.... now i could simply swallow all the IncPagers +# into a FvwmButtons (PagerButtons under the symlink) and it looks just like +# FvwmPager, but has colors. Here is the relevant code: + +# *IncPager0Back #266294 +# *IncPager1Back #AA0000 +# *IncPager2Back #FFCC00 +# *IncPager3Back #888800 + +# *PagerButtons - whatever SwallowModule "IncPager0" IncPager0 0 0 +# *PagerButtons - whatever SwallowModule "IncPager1" IncPager1 1 1 +# *PagerButtons - whatever SwallowModule "IncPager2" IncPager2 2 2 +# *PagerButtons - whatever SwallowModule "IncPager3" IncPager3 3 3 + +#_____________________________________________________ E.8 Audio +# E.8 FvwmAudio -- Set Up Sounds. + +*FvwmAudioPlayCmd /usr/local/bin/AF/aplay +*FvwmAudioDir /usr/local/share/sound_files/fvwm + +*FvwmAudio startup hi.snd +*FvwmAudio shutdown Goodbye.au +*FvwmAudio new_page Oomph.au +*FvwmAudio res_class beep_metal.au +*FvwmAudio focus_change thrust.au +*FvwmAudio add_window drip.au +*FvwmAudio destroy_window flush.au +*FvwmAudio deiconify ploop.au +*FvwmAudio unknown doh.au +*FvwmAudio iconify beep_pure_saw.au +*FvwmAudio icon_name beep_robotic.au +*FvwmAudio window_name beep_fm.au +*FvwmAudio new_desk Teeswing.au +*FvwmAudio raise_window arrp.au +*FvwmAudio lower_window tap3.au +*FvwmAudio configure_window dadan.au +*FvwmAudio res_name Cork.au +*FvwmAudio end_windowlist hasta_la_vista.au +*FvwmAudio toggle_paging ST_laser.au + +#_____________________________________________________ E.9 new_pager +#E.9 .new_pager +#KillModule FvwmPager +#*FvwmPagerBack pink +#*FvwmPagerFore green +#*FvwmPagerHilight red +#FvwmPager 0 3 + +#_____________________________________________________ E.A old_pager +#E.A .old_pager +#KillModule FvwmPager +#*FvwmPagerBack #908090 +#*FvwmPagerFore #484048 +#*FvwmPagerHilight #cab3ca +#FvwmPager 0 3 + +#_____________________________________________________ E.B FvwmForm +# E.B FvwmForm +# The FvwmForm module already has the capability of calling it as +# FvwmForm, but telling it to use the settings for some other name, like +# so: +# +# + "Form - Rlogin" Module FvwmForm Rlogin +# + "Form - QuitVerify" Module FvwmForm QuitVerify + +# I didn't like having all of those symbolic links either... +# +# Section: post.hook +# +# Use post.hook to force things that may have been changed earlier, for +# example, key bindinds. +# + +*FvwmScript: DefaultColorset 35 + +*FvwmFormDefault: Colorset 35 + +*FvwmFormDefault: ItemColorset 36 + +*FvwmTaskBar: Colorset 17 +*FvwmTaskBar: FocusColorset 18 +*FvwmTaskBar: IconColorset 19 +*FvwmTaskBar: TipsColorset 16 + +*FvwmTaskBar: Geometry +0-0 + + +*FvwmTaskBar: Action Click1 DeiconifyRaiseAndFocus +*FvwmTaskBar: Action Click2 Iconify On +*FvwmTaskBar: Action Click3 Lower + +*FvwmTaskBar: UseSkipList +*FvwmTaskBar: UseIconNames +*FvwmTaskBar: AutoStick +*FvwmTaskBar: AutoHide +*FvwmTaskBar: ShowTips +*FvwmTaskBar: NoIconAction SendToModule FvwmAnimate animate +*FvwmTaskBar: WindowButtonsLeftMargin 8 + +# Animations are controlled by this module +# You could also use Frame, Lines, Flip, Turn, Twist, Random and None. +DestroyModuleConfig FvwmAnimate: * +*FvwmAnimate: Effect Flip +*FvwmAnimate: Delay 0 +*FvwmAnimate: Iterations 30 +#*FvwmAnimate: Twist 1 +*FvwmAnimate: Width 2 + +##### +# Hit Alt+Esc to toggle FvwmProxy, which allows you to see all windows on your +# desktop, even if they've been obscured..really cool. +################## +DestroyModuleConfig FvwmProxy: * +*FvwmProxy: ProxyMove true + +Key Escape A M SendToModule FvwmProxy ShowToggle + + + +# FvwmIconMan is a highly configurable module for managing running tasks. +# This one is configured to look like a TaskBar. +Style FvwmIconMan sticky, parentalrelativity, handlewidth 0, borderwidth +DestroyModuleConfig FvwmIconMan: * +*FvwmIconMan: ManagerGeometry 1x1 +*FvwmIconMan: ButtonGeometry 24x23 +*FvwmIconMan: FocusAndSelectButton down +*FvwmIconMan: FocusButton down +*FvwmIconMan: IconButton down +*FvwmIconMan: PlainButton down +*FvwmIconMan: SelectButton down +*FvwmIconMan: Action Mouse 2 N sendcommand Thumbnail +*FvwmIconMan: Action Mouse 1 N sendcommand RaiseLower, sendcommand FlipFocus +*FvwmIconMan: ReliefThickness 1 +*FvwmIconMan: Resolution Page +*FvwmIconMan: DrawIcons Always +*FvwmIconMan: FollowFocus True +*FvwmIconMan: UseWinList True +*FvwmIconMan: ShowOnlyIcons False +*FvwmIconMan: Format "%c: %i" +*FvwmIconMan: Title "" +*FvwmIconMan: Sort id + +# FvwmScroll swallows applications into smaller containers, sometimes handy. +DestroyModuleConfig FvwmScroll: * +*FvwmScroll: Back #f6f6f6 +*FvwmScroll: Fore #f6f6f6 + +# FvwmEvent can bind Commands to Events +DestroyModuleConfig FvwmEvent: * +*FvwmEvent: PassID +*FvwmEvent: Delay 5 +*FvwmEvent: StartDelay 10 + +# ============================================================================ +# IV. Start/Stop Functions: +# ============================================================================ + +# These functions are executed when you enter (Start) and when you leave +# (Stop) this component. For example, in colors@blackbox they are used to +# set/unset a good window "transparency" style ParentalRelativity/Opacity; +# in colors@cde and colors@luthien these functions are used for more things. + +# DestroyFunc FuncFvwmStartColors +# AddToFunc FuncFvwmStartColors + +# DestroyFunc FuncFvwmStopColors +# AddToFunc FuncFvwmStopColors + +# ============================================================================ +# V. Module Configurations (under modules/) +# ============================================================================ + +# The actual module configuration commands, including their colorset +# settings may be found in the theme directory modules/ in files named +# main:FvwmModule and main:FvwmModule-SubName. +# +# Examples: +# +# *FvwmPager-Single: Colorset * 14 +# *FvwmPager-Single: HilightColorset * 15 +# *FvwmPager-Single: WindowColorsets 1 2 +# *FvwmPager-Single: BalloonColorset * 16 +# +# *FvwmPager-Desker: Colorset * 14 +# *FvwmPager-Desker: HilightColorset * 15 +# *FvwmPager-Desker: WindowColorsets 1 2 +# *FvwmPager-Desker: BalloonColorset * 16 +# +# *FvwmIconMan: *colorset 12 +# *FvwmIconMan: *iconcolorset 19 +# *FvwmIconMan: *plaincolorset 17 +# *FvwmIconMan: *selectcolorset 20 +# *FvwmIconMan: *focuscolorset 18 +# *FvwmIconMan: *focusandselectcolorset 20 +# +# *FvwmButtons: Colorset 10 +# +# *FvwmTaskBar: Colorset 17 +# *FvwmTaskBar: FocusColorset 18 +# *FvwmTaskBar: IconColorset 19 +# *FvwmTaskBar: TipsColorset 16 +# +# *FvwmWinList: Colorset 17 +# *FvwmWinList: FocusColorset 18 +# *FvwmWinList: IconColorset 19 +# +# *FvwmIconBox: Colorset 12 +# *FvwmIconBox: IconColorset 17 +# *FvwmIconBox: IconHiColorset 18 + +# ============================================================================ +# VI. Miscellaneous Configurations +# ============================================================================ + +# Application colorsets are used in menus@default and menus-programs@default, +# functions@default, functions-appbind@default and other components. +# +# Examples: +# +# Module FvwmConsole -fg $[fg.cs22] -bg $[bg.cs22] +# Exec exec xterm -fg $[fg.cs30] -bg $[bg.cs30] +# Exec exec xterm -fg $[fg.cs31] -bg $[bg.cs31] -e su -l +# Exec exec xterm -fg $[fg.cs32] -bg $[bg.cs32] -T "Remote" -e rsh tiger +# Exec exec xterm -fg $[fg.cs33] -bg $[bg.cs33] -T "File Viewer" -e less "$0" +# FvwmScript FvwmScript-ThemesCenter --text-colorset 36 --viewer-colorset 33 +# FvwmScript FvwmScript-IconBrowser --text-colorset 36 --icon-colorset 10 + +# Module FvwmGtk +# *FvwmGtk: Destroy gnome-all +# *FvwmGtk: Menu gnome-all +# *FvwmGtk: Title "Gnome Menus" +# *FvwmGtk: Separator +# *FvwmGtk: Destroy gnome-sys +# *FvwmGtk: Submenu "System" gnome-sys +# *FvwmGtk: Destroy gnome-user +# *FvwmGtk: Submenu "User" gnome-user +# *FvwmGtk: Destroy gnome-redhat +# *FvwmGtk: Submenu "RedHat" gnome-redhat +# +# PipeRead 'fvwm-menu-desktop --type gtk --enable-mini-icons --icon-folder :re --icon-app :re --icon-title :re --icon-toptitle :re' +# PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-user --enable-mini-icons' +# PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-redhat --enable-mini-icons' + +DestroyModuleConfig GridButtons +#*GridButtons: geometry 144x96 +*GridButtons: columns 2 +*GridButtons: rows 2 +*GridButtons: (Title "0", Action "MoveLastWindowToPage 0 0") +*GridButtons: (Title "2", Action "MoveLastWindowToPage 1 0") +*GridButtons: (Title "1", Action "MoveLastWindowToPage 0 1") +*GridButtons: (Title "3", Action "MoveLastWindowToPage 1 1") + --- fvwm-2.5.27.ds.orig/debian/manoj/colorsets +++ fvwm-2.5.27.ds/debian/manoj/colorsets @@ -0,0 +1,401 @@ +########################################################################### +# set up the colors +# + +# selected (hilighted) window +# !HiForeColor Black (new command=HilightColor) +# HiBackColor PaleVioletRed +# !HiBackColor #9a5a9187d9da (new command=HilightColor) + +# Highlight color +# +# This sets the textcolor and background color for the active window +#Set the foreground and background color for selected windows +#Style * HilightFore #ff5555, HilightBack #1ea819 +HilightColor MidnightBlue #c06077 + +# sticky windows look like this +#!StickyForeColor Black (no sticky foreground color in fvwm2) +#!StickyBackColor CornflowerBlue (no sticky background color in fvwm2) + +# Menu colors +#!MenuForeColor Black (new command=MenuStyle) +#!MenuBackColor grey (new command=MenuStyle) +#!MenuStippleColor SlateGrey (new command=MenuStyle) + +# COLORSETS USED BY FVWM-THEMES +# +#This file includes the default colors@ component file (I, II, III and IV) and +#some comments on where these colorsets are used (V and VI). fvwm-themes uses +#internally colorsets 0 to 39, some colorsets are reserved for the future use. +#So, a user can freely use colorsets starting from 40 (for example, in his +#colors-extra@ component) if he ever needs any additional colorsets. +# +#Colorset N | Meaning | Usage Examples +#-----------+----------------------------+------------------------------------- +# 0 | default | feedback windows, FvwmScroll +# 1 | inactive window | window/icon titles, windows in Pager +# 2 | active window | window/icon titles, windows in Pager +# 3 | inactive borders | window borders (may copy 1) +# 4 | active borders | window borders (may copy 2) +# 5 | inactive menu item | menus (may have pixmap or gradient) +# 6 | active menu item | menus (only bg/fg used) +# 7 | greyed menu item | menus (only fg used) +# 8 | reserved | for the fvwm-themes future use +# 9 | reserved | for the fvwm-themes future use +# 10 | modules, default | Button Bar, Pager, other modules +# 11 | modules, default hilight | Button Bar +# 12 | modules, special | gradient for IconMan/IconBox +# 13 | modules, swallowed apps | bg, fg, sh, hi for xclock/xload etc. +# 14 | modules, default #2 | alternative for Pager, Button Bar +# 15 | modules, default hilight #2| alternative for Pager +# 16 | modules, balloons | TaskBar, Pager +# 17 | modules, winlist, standard | item of IconMan, WinList, TaskBar +# 18 | modules, winlist, active | --.-- +# 19 | modules, winlist, iconified| --.-- +# 20 | modules, winlist, pointed | --.-- +# 21 | modules, ident | FvwmIdent +# 22 | modules, console | FvwmConsole +# 23 | modules, transparent | Button Bar +# 24 | modules, reserved | for the fvwm-themes future use +# 25 | modules, reserved | for the fvwm-themes future use +# 26 | reserved | for the fvwm-themes future use +# 27 | reserved | for the fvwm-themes future use +# 28 | reserved | for the fvwm-themes future use +# 29 | dynamical/temporary | tools for choosing/previewing colors +# 30 | regular terminal | xterm/rxvt or any other terminal +# 31 | admin terminal | terminal for root (su) +# 32 | remote terminal | terminal with ssh/rsh/telnet +# 33 | viewer terminal | man, less, tail -f +# 34 | console application | top, editor +# 35 | dialog main area | FvwmScript, FvwmForm, xmessage +# 36 | dialog text area | FvwmScript, FvwmForm, xmessage +# 37 | reserved | for the fvwm-themes future use +# 38 | reserved | for the fvwm-themes future use +# 39 | reserved | for the fvwm-themes future use + +# **************************************************************************** +# +# I. FVWM Colorsets (0 to 9) +# I.1. Default Colorsets +# I.2. Window Decorations +# I.3. Menu Colorsets +# +# II. Module Colorsets (10 to 29) +# II.1. Common Colorsets +# II.2. Window List Module Colorsets +# II.3. Other Module Colorsets +# II.4. External Colorsets +# +# III. Application Colorsets (30 to 35) +# +# IV. Start/Stop functions +# +# V. Module Configurations (under modules/) +# +# VI. Miscellaneous Configurations +# +# **************************************************************************** + +# ============================================================================ +# I. FVWM Colorsets +# ============================================================================ + +# ---------------------- +# I.1. Default Colorsets +# ---------------------- + +# for feedback windows (like geometry window and NoteMessage) and FvwmScroll +# +#Colorset 0 fg black, bg #70A0A0 +#Colorset 0 fg white, Transparent +Colorset 0 fg Blue, Transparent + +# ----------------------- +# I.2. Window Decorations +# ----------------------- + +# The following colors are used in FvwmPager for the window colors +# and in a title bar of windows (shade/hilight colors, computed from +# the bg color, but might be specified directly by sh and hi). +# The title bar background is defined below using TitleStyle. + +# window title, inactive and active +# +#Colorset 1 fg black, bg rgb:88/7C/66, Plain, NoShape +#Colorset 1 fg #f6f6f6, bg black, IconAlpha 40 +Colorset 1 fg black, bg rgb:a0/a0/b0, Plain, NoShape + +Style "*" Colorset 1 + +#Colorset 2 fg white, bg black, fgsh black, IconAlpha 100 +Colorset 2 fg white, bg rgb:80/80/90, Plain, NoShape + +*FvwmPager: WindowColorsets 1 2 +Style * HilightColorset 2 + + +# window borders, inactive and active +# +Colorset 3 fg black, bg rgb:88/7C/66, Plain, NoShape + +Style * BorderColorset 3 + +Colorset 4 fg black, bg rgb:CC/BA/99, Plain, NoShape + +Style * HilightBorderColorset 4 + +# background for window title, buttons and border +# +DestroyFunc FuncFvwmDecorBackground +AddToFunc FuncFvwmDecorBackground ++ I TitleStyle ActiveUp (Solid rgb:CC/BA/99 -- Raised) ++ I TitleStyle ActiveDown (Solid rgb:CC/BA/99 -- Raised) ++ I TitleStyle Inactive (Solid rgb:88/7C/66 -- Raised) ++ I TitleStyle ToggledActiveUp (Solid rgb:CC/BA/99 -- Raised) ++ I TitleStyle ToggledActiveDown (Solid rgb:CC/BA/99 -- Raised) ++ I TitleStyle ToggledInactive (Solid rgb:88/7C/66 -- Raised) + ++ I ButtonStyle All Pixmap 16x16-general/empty.xpm ++ I ButtonStyle All -- UseTitleStyle + +# ------------------- +# I.3. Menu Colorsets +# ------------------- + +# inactive menu item fg+bg and menu face if any +# +#Colorset 5 fg black, bg rgb:A0/B8/D0, Plain, NoShape +#Colorset 5 RootTransparent, fg rgb:A0/B8/D0, bg rgb:08/08/03, CGradient 50 rgb:50/50/78 rgb:40/40/5a, Plain, NoShape +# Colorset 5 RootTransparent buffer, Tint rgb:00/30/30 20 +# Colorset 5 RootTransparent buffer, bg average, Tint black 30, bgTint black 30 +Colorset 5 Transparent, fg rgb:C7/DF/F7, fgsh grey30, Tint rgb:30/20/10 30 + +MenuStyle * MenuColorset 5 + +# active menu item fg+bg +# +# Colorset 6 RootTransparent, fg rgb:95/12/12, bg rgb:D0/D9/E8, Plain, NoShape +# Colorset 6 RootTransparent, fg rgb:f8/f8/f3, bg rgb:40/5a/40, Tint black 20, bgTint black 20 +Colorset 6 Transparent, fg rgb:f8/f8/f3, Tint black 20, bgTint black 20 +MenuStyle * ActiveColorset 6 + +# greyed menu item fg +# +#Colorset 7 RootTransparent, fg grey48, bg grey48, Plain, NoShape +Colorset 7 Transparent, fg grey48 + +MenuStyle * GreyedColorset 7 + +# ------------------------------------------------- +# Colorsets 8 and 9 are reserved for the future use. + +# ============================================================================ +# II. Module Colorsets +# ============================================================================ + +# ---------------------- +# II.1. Common Colorsets +# ---------------------- + +# default for modules +# For FvwmButtons, FvwmPager, can be also used for FvwmIconMan, FvwmIconBox. +# +# Colorset 10 fg black, bg rgb:80/A0/A0, Plain, NoShape +# Colorset 10 fg rgb:A9/99/A9, bg rgb:28/20/28, Plain, NoShape +Colorset 10 fg rgb:A9/99/A9, RootTransparent buffer + +*FvwmPager: Colorset 1 10 + +# default hilight for modules +# For hilighting a part of a button bar (some swallowed apps for example). +# +# Colorset 11 fg black, bg white, Plain, NoShape +Colorset 11 fg rgb:CA/B3/CA, bg rgb:08/10/58, Plain, NoShape + +*FvwmPager: HilightColorset 1 11 + +# special or funny: a gradient or a pixmap +# May be used in certain FvwmButtons, FvwmIconMan, FvwmIconBox. +# +Colorset 12 fg MistyRose, bg rgb:25/26/30, \ + VGradient 20 rgb:25/20/30 rgb:69/65/70, NoShape + +*FvwmIconBox: Colorset 12 + + +# swallowed window: the hilight and shadow colors should be defined +# (-hd of xclock and -hl of xload use sh, and -hl of xclock uses hi) +# +Colorset 13 fg HoneyDew, bg rgb:25/26/2C, hi Red, sh Gray10, \ + Plain, NoShape + + +# default #2 +# FvwmPager or to get more colors in FvwmButtons, can be set to 10. +# +#Colorset 14 fg rgb:A0/90/A0, bg rgb:12/14/16, Plain, NoShape +Colorset 14 fg rgb:A0/90/A0, RootTransparent + +*FvwmPager: Colorset 0 14 + +# default hilight #2 +# FvwmPager or to get more colors in FvwmButtons, can be set to 11. +# +#Colorset 15 RootTransparent, fg black, bg rgb:C0/F0/F0, Plain, NoShape +Colorset 15 fg rgb:DA/C3/DA, bg Sienna4, Plain, NoShape + +*FvwmPager: HilightColorset 0 15 +*FvwmIconMan: Colorset 15 + +# tips/balloons (TaskBar and FvwmPager) +# +#Colorset 16 RootTransparent, fg black, bg rgb:F0/F0/C0, Plain, NoShape +Colorset 16 Transparent, fg Yellow + +*FvwmPager: BalloonColorset * 16 + +*FvwmIconMan: FocusAndSelectColorset 16 +*FvwmIconMan: FocusColorset 16 + +# ---------------------------------- +# II.2. Window List Module Colorsets +# ---------------------------------- + +# standard item +# Colorset 17 fg black, bg rgb:80/A0/A0, Plain, NoShape +Colorset 17 fg black, bg rgb:90/A0/A0, Plain, NoShape + +# active item +Colorset 18 fg black, bg rgb:A0/C8/C8, Plain, NoShape + +# iconified item +Colorset 19 fg white, bg rgb:60/78/78, Plain, NoShape + +*FvwmIconBox: IconColorset 19 +Style * IconTitleColorset 19 +Style * IconBackGroundColorset 19 + +# pointed item +Colorset 20 fg black, bg rgb:88/AA/AA, Plain, NoShape + +*FvwmIconBox: IconHiColorset 20 +Style * HilightIconTitleColorset 20 + +# ---------------------------- +# II.3. Other Module Colorsets +# ---------------------------- + +# FvwmIdent +# +Colorset 21 fg black, bg bisque, Plain, NoShape + +*FvwmIdent: Colorset 21 + +# FvwmConsole +# +Colorset 22 fg white, bg rgb:00/30/60, Plain, NoShape + +# transparent +#Colorset 23 fg $[fg.cs10], bg $[bg.cs10], Transparent, Plain, NoShape +#Colorset 23 fg $[fg.cs10], Transparent, Tint rgb:00/30/60 10 +Colorset 23 fg $[fg.cs10], RootTransparent, Tint rgb:00/30/60 10 + +*FvwmButtons: Colorset 23 + +# ------------------------ +# II.4. External Colorsets +# ------------------------ + +# ---------------------------- +# reserved for modules@: 24-25 + +# ---------------------------------- +# reserved for the future use: 26-28 + +# temporary colorset: 29, has no static definition, used dynamically + +# ============================================================================ +# III. Application Colorsets +# ============================================================================ + +# regular terminal (xterm, rxvt, Eterm) Work2 +# +Colorset 30 fg white, bg rgb:00/00/50, Plain, NoShape + +# admin terminal (su xterm) (root) +# +Colorset 31 fg white, bg rgb:00/50/50, Plain, NoShape + +# remote terminal (ssh, telnet) Work3 +# +Colorset 32 fg white, bg rgb:50/00/00, Plain, NoShape + +# viewer terminal (man, less, tail -f) Root +# +Colorset 33 fg white, bg rgb:00/50/00, Plain, NoShape + +# application run in the terminal, text editor using ft-xrdb +# +Colorset 34 fg rgb:FF/FF/E8, bg rgb:30/48/48, Plain, NoShape + +# dialog main background (FvwmScript, FvwmForm, xmessage, ft-xrdb) +# +Colorset 35 fg black, bg rgb:80/A0/80, Plain, NoShape + +# dialog text area (FvwmScript, FvwmForm, xmessage, ft-xrdb) +# +Colorset 36 fg black, bg rgb:A0/C8/A0, Plain, NoShape + +# -------------------------------------------------- +# Colorsets 37 to 39 are reserved for the future use. + +Colorset 40 fg SkyBlue, bg rgb:75/75/75 + +Style "Root" Colorset 40 +Style "root*" Colorset 40 + +Colorset 41 fg Red, bg Green, Plain, NoShape + +Style "Root" HilightColorset 41 +Style "root*" HilightColorset 41 + +# window borders, inactive and active +# +Colorset 42 fg rgb:88/7C/66, bg black, Plain, NoShape + +Style "Root" BorderColorset 42 +Style "root*" BorderColorset 42 + +Colorset 43 fg rgb:CC/BA/99, bg black, Plain, NoShape + +Style "Root" HilightBorderColorset 43 +Style "root*" HilightBorderColorset 43 + + +#Colorset 50 Transparent, bg pink3, fg gray20 +#Colorset 50 Transparent, fg rgb:A9/A9/A9, bg rgb:20/20/20, Plain, NoShape +Colorset 50 Transparent, fg rgb:E9/E9/E9 + +# Used for menus and titles +#Colorset 51 RootTransparent buffer, fg gray80, bg #050218 +#Colorset 52 fg #151228, VGradient 40 #a17aa1 #714a71, bg average + +Colorset 51 fg Red, bg SkyBlue4 +Colorset 52 fg SkyBlue, VGradient 40 #8888aa #8888ee, bg Red + +TitleStyle Inactive Colorset 51 -- flat +AddTitleStyle Inactive Colorset 52 50 # alpha == 60% here + +ButtonStyle All AllInactive Colorset 51 -- flat +AddButtonStyle All AllInactive Colorset 52 50 + + +ButtonStyle All AllInactive -- !UseTitleStyle flat +TitleStyle Active Colorset 52 -- raised + +ButtonStyle All AllActive -- UseTitleStyle raised + + +colorset 77 transparent +*FvwmIconMan: *Colorset 77 --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmAuto.hook +++ fvwm-2.5.27.ds/debian/manoj/FvwmAuto.hook @@ -0,0 +1,36 @@ + +DestroyFunc RestoreIconified +AddToFunc RestoreIconified ++ I Current (Iconic) Iconify false + + + +KillModule FvwmAuto +#Module FvwmAuto 5250 Raise Nop +Module FvwmAuto 3000 RestoreIconified Nop + +# Shade windows after a bit +#Module FvwmAuto 300 "ThisWindow (Shaded) WindowShade off" + +# Unachade shaded windows +#Module FvwmAuto 200 "Silent WindowShade off" "Silent WindowShade on" + +AddToFunc funky_cancel ++ I UnsetEnv funky_shade_w ++ I WindowShade + +# shade only windows that were previously unshaded when they received +# focus. +AddToFunc funky_shade ++ I WindowId $[funky_shade_w] (!shaded) WindowShade on + +AddToFunc funky_unshade ++ I funky_shade ++ I UnsetEnv funky_shade_w ++ I ThisWindow (shaded) SetEnv funky_shade_w $w ++ I WindowShade off + +AddToFunc StartFunction ++ I UnsetEnv funky_shade_w ++ I FvwmAuto 300 "Silent funky_unshade" "Silent funky_shade" + --- fvwm-2.5.27.ds.orig/debian/manoj/post.hook +++ fvwm-2.5.27.ds/debian/manoj/post.hook @@ -0,0 +1,2 @@ +# + --- fvwm-2.5.27.ds.orig/debian/manoj/screendiffs.hook +++ fvwm-2.5.27.ds/debian/manoj/screendiffs.hook @@ -0,0 +1,68 @@ + +undefine('include') +define(stripquote, {[substr(substr($1,1), 0, index(substr($1,1),'))]}) +# Start + +# This file is really created to disrtinguish between my laptop and +# the destop. For the desktop XPIX and YPIX are 24 and 32; for the +# laptop it is 32 and 43 respectively. Please note that by themselves, +# these are not enough; you need the physical sixe of the screen to +# make a call. +define(XSIZE, ifelse(CLIENTHOST, `calidity', 12, CLIENTHOST, `glaurung', 16, 16))dnl +define(YSIZE, ifelse(CLIENTHOST, `calidity', 9, CLIENTHOST, `glaurung', 12, 12))dnl + +define(XPIX, eval(WIDTH / XSIZE))dnl +define(YPIX, eval(HEIGHT / YSIZE))dnl + +ifelse(eval(XPIX < 100), 1, `', ` +DefaultFont "Shadow=1 NE:-adobe-helvetica-bold-r-*-*-18-*-*-*-*-*-*-*" +DefaultFont "Shadow=1 NE:-bitstream-bitstream vera sans mono-medium-r-normal--*-*-*-*-m-*-*-*" +')dnl + + +# Styles +ifelse(eval(XPIX < 100), 1, ` +Style "*" Font -adobe-helvetica-bold-r-*-*-13-*-*-*-*-*-*-* +Style * IconFont -adobe-helvetica-bold-r-*-*-13-*-*-*-*-*-*-* +MenuStyle * Font "Shadow=1 NE:StringEncoding=UTF-8:xft:Verdana:Medium:pixelsize=13:minspace=True;-adobe-courier-bold-r-normal--10-*" +Style "login" Font -adobe-helvetica-bold-r-*-*-13-*-*-*-*-*-*-* +*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* +*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* +*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* +*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* +*FvwmButtonsFont -adobe-helvetica-bold-r-*-*-11-*-*-*-*-*-*-* +*FvwmTaskBar: Font -adobe-helvetica-medium-r-*-*-14-*-*-*-*-*-*-* +*FvwmTaskBar: SelFont -adobe-helvetica-bold-r-*-*-14-*-*-*-*-*-*-* +*FvwmTaskBar: StatusFont fixed +*FvwmPagerSmallFont 5x8 +', ` +Style "*" Font "Shadow=1 NE:-bitstream-bitstream vera sans mono-medium-r-normal--*-*-*-*-m-*-*-*" +Style * IconFont -adobe-helvetica-bold-r-*-*-18-*-*-*-*-*-*-* +MenuStyle * Font "Shadow=1 NE:StringEncoding=UTF-8:xft:bitstream vera sans mono:Medium:pixelsize=14:minspace=True;-bitstream-bitstream vera sans mono-medium-r-normal--17-120-100-100-m-*-*-*" +Style "login" Font -adobe-helvetica-bold-r-*-*-18-*-*-*-*-*-*-* +Style "xterm" Font -adobe-helvetica-bold-r-*-*-13-*-*-*-*-*-*-* +*FvwmIdentFont -adobe-helvetica-medium-r-*-*-17-*-*-*-*-*-*-* +*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-17-*-*-*-*-*-*-* +*FvwmPagerFont -adobe-helvetica-bold-r-*-*-11-*-*-*-*-*-*-* +*FvwmWinListFont -adobe-helvetica-bold-r-*-*-18-*-*-*-*-*-*-* +*FvwmButtonsFont -adobe-helvetica-bold-r-*-*-18-*-*-*-*-*-*-* +*FvwmTaskBar: Font -adobe-helvetica-medium-r-*-*-17-*-*-*-*-*-*-* +*FvwmTaskBar: SelFont -adobe-helvetica-bold-r-*-*-17-*-*-*-*-*-*-* +*FvwmTaskBar: StatusFont fixed +*FvwmPagerSmallFont 5x8 +')dnl + +# FvwmForm differences +ifelse(eval(XPIX < 100), 1, ` +*FvwmForm-Form: Input Font 63 "8x13bold" +*FvwmForm-Form: Input InputFont 63 "8x13bold" +*FvwmForm-Form: Input ButtonFont 63 "8x13bold" +*FvwmForm-RootCursor: ButtonFont 6x13 +', ` +*FvwmForm-Form: Input Font 63 "8x16" +*FvwmForm-Form: Input InputFont 63 "8x16" +*FvwmForm-Form: Input ButtonFont 63 "8x16" +*FvwmForm-RootCursor: ButtonFont 9x15 +Style "xterm" Font -adobe-helvetica-bold-r-*-*-18-*-*-*-*-*-*-* +')dnl + --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-TalkHelp +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-TalkHelp @@ -0,0 +1,27 @@ +# FvwmForm-TalkHelp - Help Text for FvwmForm-Talk +DestroyModuleConfig FvwmForm-TalkHelp: * +*FvwmForm-TalkHelp: WarpPointer +# Layout +*FvwmForm-TalkHelp: Line center +*FvwmForm-TalkHelp: Text "Talk to Fvwm - Help" +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: Text " " +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: PadVText 0 +*FvwmForm-TalkHelp: Text "Enter commands in the \"Command:\" input field." +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: Text "Commands beginning with \"!\" are executed by the" +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: Text "shell as a sub-process of the form." +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: Text "All other commands are sent to fvwm for execution." +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: Text "" +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: Text "Fvwm error messages are shown on the \"Msg:\" line." +*FvwmForm-TalkHelp: Line left +*FvwmForm-TalkHelp: Text "" +# Buttons +*FvwmForm-TalkHelp: Line center +*FvwmForm-TalkHelp: Button quit "Return - Dismiss" ^M +*FvwmForm-TalkHelp: Command Nop --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-Capture +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-Capture @@ -0,0 +1,29 @@ +# Capture Window - This example is a front-end to xwd, xwud, and xpr. +DestroyModuleConfig FvwmForm-Capture: * +*FvwmForm-Capture: Line center +*FvwmForm-Capture: Text "Capture Window" +*FvwmForm-Capture: Line left +*FvwmForm-Capture: Text "File: " +*FvwmForm-Capture: Input file 25 "/tmp/Capture" +*FvwmForm-Capture: Line left +*FvwmForm-Capture: Text "Printer: " +*FvwmForm-Capture: Input printer 20 "$PRINTER" +*FvwmForm-Capture: Line expand +*FvwmForm-Capture: Selection PtrType single +*FvwmForm-Capture: Choice PS ps on "PostScript" +*FvwmForm-Capture: Choice Ljet ljet off "HP LaserJet" +*FvwmForm-Capture: Line left +*FvwmForm-Capture: Text "xwd options:" +*FvwmForm-Capture: Line expand +*FvwmForm-Capture: Selection Options multiple +*FvwmForm-Capture: Choice Brd -nobdrs off "No border" +*FvwmForm-Capture: Choice Frm -frame on "With frame" +*FvwmForm-Capture: Choice XYZ -xy off "XY format" +*FvwmForm-Capture: Line expand +*FvwmForm-Capture: Button continue "Capture" ^M +*FvwmForm-Capture: Command Exec exec xwd -out $(file) $(Options) & +*FvwmForm-Capture: Button continue "Preview" +*FvwmForm-Capture: Command Exec exec xwud -in $(file) & +*FvwmForm-Capture: Button continue "Print" +*FvwmForm-Capture: Command Exec exec xpr -device $(PtrType) $(file) | lpr -P $(printer) & +*FvwmForm-Capture: Button quit "Quit" --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmForm-RootCursor +++ fvwm-2.5.27.ds/debian/manoj/FvwmForm-RootCursor @@ -0,0 +1,154 @@ +# This form changes the root cursor font and color. + +DestroyModuleConfig FvwmForm-RootCursor: * +*FvwmForm-RootCursor: WarpPointer +*FvwmForm-RootCursor: Font fixed + +*FvwmForm-RootCursor: Text "Cursor font" +*FvwmForm-RootCursor: Selection cursor_font single + +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font X_cursor off "X_cursor " +*FvwmForm-RootCursor: Choice cursor_font arrow off "arrow " +*FvwmForm-RootCursor: Choice cursor_font based_arrow_down off "based_arrow_down " +*FvwmForm-RootCursor: Choice cursor_font based_arrow_up off "based_arrow_up " +*FvwmForm-RootCursor: Choice cursor_font boat off "boat " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font bogosity off "bogosity " +*FvwmForm-RootCursor: Choice cursor_font bottom_left_corner off "bottom_left_corner " +*FvwmForm-RootCursor: Choice cursor_font bottom_right_corner off "bottom_right_corner" +*FvwmForm-RootCursor: Choice cursor_font bottom_side off "bottom_side " +*FvwmForm-RootCursor: Choice cursor_font bottom_tee off "bottom_tee " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font box_spiral off "box_spiral " +*FvwmForm-RootCursor: Choice cursor_font center_ptr off "center_ptr " +*FvwmForm-RootCursor: Choice cursor_font circle off "circle " +*FvwmForm-RootCursor: Choice cursor_font clock off "clock " +*FvwmForm-RootCursor: Choice cursor_font coffee_mug off "coffee_mug " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font cross off "cross " +*FvwmForm-RootCursor: Choice cursor_font cross_reverse off "cross_reverse " +*FvwmForm-RootCursor: Choice cursor_font crosshair off "crosshair " +*FvwmForm-RootCursor: Choice cursor_font diamond_cross off "diamond_cross " +*FvwmForm-RootCursor: Choice cursor_font dot off "dot " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font dotbox off "dotbox " +*FvwmForm-RootCursor: Choice cursor_font double_arrow off "double_arrow " +*FvwmForm-RootCursor: Choice cursor_font draft_large off "draft_large " +*FvwmForm-RootCursor: Choice cursor_font draft_small off "draft_small " +*FvwmForm-RootCursor: Choice cursor_font draped_box off "draped_box " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font exchange off "exchange " +*FvwmForm-RootCursor: Choice cursor_font fleur off "fleur " +*FvwmForm-RootCursor: Choice cursor_font gobbler off "gobbler " +*FvwmForm-RootCursor: Choice cursor_font gumby off "gumby " +*FvwmForm-RootCursor: Choice cursor_font hand1 off "hand1 " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font hand2 off "hand2 " +*FvwmForm-RootCursor: Choice cursor_font heart off "heart " +*FvwmForm-RootCursor: Choice cursor_font icon off "icon " +*FvwmForm-RootCursor: Choice cursor_font iron_cross off "iron_cross " +*FvwmForm-RootCursor: Choice cursor_font left_ptr on "left_ptr " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font left_side off "left_side " +*FvwmForm-RootCursor: Choice cursor_font left_tee off "left_tee " +*FvwmForm-RootCursor: Choice cursor_font leftbutton off "leftbutton " +*FvwmForm-RootCursor: Choice cursor_font ll_angle off "ll_angle " +*FvwmForm-RootCursor: Choice cursor_font lr_angle off "lr_angle " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font man off "man " +*FvwmForm-RootCursor: Choice cursor_font middlebutton off "middlebutton " +*FvwmForm-RootCursor: Choice cursor_font mouse off "mouse " +*FvwmForm-RootCursor: Choice cursor_font pencil off "pencil " +*FvwmForm-RootCursor: Choice cursor_font pirate off "pirate " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font plus off "plus " +*FvwmForm-RootCursor: Choice cursor_font question_arrow off "question_arrow " +*FvwmForm-RootCursor: Choice cursor_font right_ptr off "right_ptr " +*FvwmForm-RootCursor: Choice cursor_font right_side off "right_side " +*FvwmForm-RootCursor: Choice cursor_font right_tee off "right_tee " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font rightbutton off "rightbutton " +*FvwmForm-RootCursor: Choice cursor_font rtl_logo off "rtl_logo " +*FvwmForm-RootCursor: Choice cursor_font sailboat off "sailboat " +*FvwmForm-RootCursor: Choice cursor_font sb_down_arrow off "sb_down_arrow " +*FvwmForm-RootCursor: Choice cursor_font sb_h_double_arrow off "sb_h_double_arrow " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font sb_left_arrow off "sb_left_arrow " +*FvwmForm-RootCursor: Choice cursor_font sb_right_arrow off "sb_right_arrow " +*FvwmForm-RootCursor: Choice cursor_font sb_up_arrow off "sb_up_arrow " +*FvwmForm-RootCursor: Choice cursor_font sb_v_double_arrow off "sb_v_double_arrow " +*FvwmForm-RootCursor: Choice cursor_font shuttle off "shuttle " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font sizing off "sizing " +*FvwmForm-RootCursor: Choice cursor_font spider off "spider " +*FvwmForm-RootCursor: Choice cursor_font spraycan off "spraycan " +*FvwmForm-RootCursor: Choice cursor_font star off "star " +*FvwmForm-RootCursor: Choice cursor_font target off "target " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font tcross off "tcross " +*FvwmForm-RootCursor: Choice cursor_font top_left_arrow off "top_left_arrow " +*FvwmForm-RootCursor: Choice cursor_font top_left_corner off "top_left_corner " +*FvwmForm-RootCursor: Choice cursor_font top_right_corner off "top_right_corner " +*FvwmForm-RootCursor: Choice cursor_font top_side off "top_side " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font top_tee off "top_tee " +*FvwmForm-RootCursor: Choice cursor_font trek off "trek " +*FvwmForm-RootCursor: Choice cursor_font ul_angle off "ul_angle " +*FvwmForm-RootCursor: Choice cursor_font umbrella off "umbrella " +*FvwmForm-RootCursor: Choice cursor_font ur_angle off "ur_angle " +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Choice cursor_font watch off "watch " +*FvwmForm-RootCursor: Choice cursor_font xterm off "xterm " + +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Text "Cursor inner color" +*FvwmForm-RootCursor: Line expand + +*FvwmForm-RootCursor: Selection cursor_fg single +*FvwmForm-RootCursor: Line center +*FvwmForm-RootCursor: Choice cursor_fg black on " black " +*FvwmForm-RootCursor: Choice cursor_fg red off " red " +*FvwmForm-RootCursor: Choice cursor_fg green off " green " +*FvwmForm-RootCursor: Choice cursor_fg blue off " blue " +*FvwmForm-RootCursor: Choice cursor_fg bisque off " bisque " +*FvwmForm-RootCursor: Choice cursor_fg brown off " brown " +*FvwmForm-RootCursor: Choice cursor_fg gray off " gray " +*FvwmForm-RootCursor: Line center +*FvwmForm-RootCursor: Choice cursor_fg cyan off " cyan " +*FvwmForm-RootCursor: Choice cursor_fg violet off " violet " +*FvwmForm-RootCursor: Choice cursor_fg seagreen off " seagreen" +*FvwmForm-RootCursor: Choice cursor_fg navy off " navy " +*FvwmForm-RootCursor: Choice cursor_fg gold off " gold " +*FvwmForm-RootCursor: Choice cursor_fg yellow off " yellow " +*FvwmForm-RootCursor: Choice cursor_fg white off " white " + +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Text "Cursor outer color" +*FvwmForm-RootCursor: Line expand + +*FvwmForm-RootCursor: Selection cursor_bg single +*FvwmForm-RootCursor: Line center +*FvwmForm-RootCursor: Choice cursor_bg black off " black " +*FvwmForm-RootCursor: Choice cursor_bg red off " red " +*FvwmForm-RootCursor: Choice cursor_bg green off " green " +*FvwmForm-RootCursor: Choice cursor_bg blue off " blue " +*FvwmForm-RootCursor: Choice cursor_bg bisque off " bisque " +*FvwmForm-RootCursor: Choice cursor_bg brown off " brown " +*FvwmForm-RootCursor: Choice cursor_bg gray off " gray " +*FvwmForm-RootCursor: Line center +*FvwmForm-RootCursor: Choice cursor_bg cyan off " cyan " +*FvwmForm-RootCursor: Choice cursor_bg violet off " violet " +*FvwmForm-RootCursor: Choice cursor_bg seagreen off " seagreen" +*FvwmForm-RootCursor: Choice cursor_bg navy off " navy " +*FvwmForm-RootCursor: Choice cursor_bg gold off " gold " +*FvwmForm-RootCursor: Choice cursor_bg yellow off " yellow " +*FvwmForm-RootCursor: Choice cursor_bg white on " white " + +*FvwmForm-RootCursor: Line expand +*FvwmForm-RootCursor: Line expand + +*FvwmForm-RootCursor: Button continue " Set Root Cursor " +*FvwmForm-RootCursor: Command CursorStyle ROOT $(cursor_font!none) $(cursor_fg) $(cursor_bg) +*FvwmForm-RootCursor: Button quit " Finish " ^[ +*FvwmForm-RootCursor: Command Nop --- fvwm-2.5.27.ds.orig/debian/manoj/init.hook +++ fvwm-2.5.27.ds/debian/manoj/init.hook @@ -0,0 +1,24 @@ +# +# Section: Init and restart functions +# This section defines the functions InitFunction and RestartFunction. +# InitFunction is executed automatically when fvwm first starts. +# RestartFunction is executed automatically when fvwm restarts itself. +# They share a common hook, init-restart.hook, and two specific hooks, +# init.hook and restart.hook. +# +# init-restart.hook should be used for starting fvwm modules, such as the +# button bar. init-hook should be used to start other applications; they +# should not be started again, when fvwm is restarted, since they don't +# die like fvwm modules do. restart.hook exists mostly for completeness; +# tell me if you find any use for it. +# +# InitFunction runs the script setup-background, which looks in +# ~/.fvwm2 to see if the user wants some specific background color or +# image. +# +#===================================================== 8. Special functions +# 8. Special functions +# Stuff to do at start-up +#+ "I" Exec setup-background +#+ "I" Exec xautolock & + --- fvwm-2.5.27.ds.orig/debian/manoj/style.hook +++ fvwm-2.5.27.ds/debian/manoj/style.hook @@ -0,0 +1,379 @@ + +# +# Section: Styles, colors, fonts, and related things +# +# This section defines the looks, behavior, and other attributes of windows. +# These are also quite personal. Modify them in post.hook. +# +# +# The following sets window colors. This is highly personal, +# of course. +# + +#===================================================== 6. styles +# 6. Set the decoration styles and window options +# Order is important!!!! +# If compatible styles are set for a single window in multiple Style +# commands, then the styles are ORed together. If conflicting styles +# are set, the last one specified is used. + +# These commands should command before any menus or functions are +# defined, and before the internal pager is started. + +# I think I made a discovery - I asked a day ago about starting +# applications on another desk *without* having fvwm switch back and +# forth between desks when the application(s) are starting. + +# When browsing the source (style.c and placement.c) I noticed a style +# called SkipMapping. I added the SkipMapping style to the apps I +# didnt want to map when starting in my .fvwmrc and lo and behold - IT +# WORKED! + +# Is the SkipMapping an - OHH I LOVE THIS - and UNDOCUMENTED feature??? +# I couldnt find any ref to it in the man pages.. + + +######################## FOCUS STUFF ############################## +# Set windows to auto-raise after 750 milliseconds if you like it. +# Autoraise can sometimes obscure pop-up windows. Performance is now +# similar to olvwm's auto-raise feature. +#AutoRaise 750 + +# Normally, we'll be in focus-follows mouse mode, but uncomment this +# for mwm-style click-to-focus +#ClickToFocus + +# or, you might like SloppyFocus, which is like focus-follow (the default +# mode), but the focus won't be removed until you go into another window +Style "*" SloppyFocus + + +# BorderStyle +# +# This sets how the border of windows will be displayed. +# Format: BorderStyle [state] [style] [ -- [!flag] ... ] +# State is either Active or Inactive +# The commands below set the borders to solid colors +# NoInset HiddenHandles +#BorderStyle -- Flat, Noinset +BorderStyle Active -- Raised +BorderStyle Inactive -- Sunk + +# Style * TitleAtRight +# Style * RightTitleRotatedCCW # CCW = counter-clock-wise, default: CW +# Style * !UseTitleDecorRotation # don't rotate titlebar pixmaps/gradients + +# this is used for non-selected windows, menus, and the panner +##Style "*" IconBox -240 540 -1 675 +Style "*" IconBox -160 800 -1 1000 +Style "Emacs" IconBox -160 400 -1 795 +Style "XTerm" IconBox -160 180 -1 395 + +Style * IconTitleRelief 0 +Style * IconBackgroundRelief 0 +Style * IconBackgroundPadding 0 +Style * IndexedIconName + +Style "*" BorderWidth 5, HandleWidth 5 +Style "*" Icon unknown1.xpm +Style * ResizeOpaque + +######################## WINDOW PLACEMENT ####################### +# RandomPlacement prevents user interaction while placing windows: +# RandomPlacement + +# SmartPlacement makes new windows pop-up in blank regions of screen +# if possible, or falls back to random or interactive placement. +#Style "*" RandomPlacement, SmartPlacement, CleverPlacement +Style "*" MinOverlapPercentPlacement + + +Style * WindowShadeSteps 20, ResizeOpaque + +Style FvwmButtons ParentalRelativity +Style Fvwm* ParentalRelativity + +# With SmartPlacement, windows will normally place themselves over icons. +# Uncomment this to change that. +#! StubbornPlacement + +# NoPPosition instructs fvwm to ignore the PPosition field in window +# geometry hints. Emacs annoyingly sets PPosition to (0,0)! +Style "*" NoPPosition + +######################## DECORATIONS ####################### +# If you want decorated transient windows, uncomment this: +Style "*" DecorateTransient + + +######################## MWM EMULATION ####################### +# +# My feeling is that everyone should use MWMDecorHints and MWMFunctionHints, +# since some applications depend on having the window manager respect them + +# MWMFunction hints parses the function information in the MOTIF_WM_HINTS +# property, and prohibits use of these functions on the window. Appropriate +# portions of the window decorations are removed. +Style "*" MWMFunctions + +# MWM is kinda picky about what can be done to transients, and it was keeping +# me from iconifying some windows that I like to iconify, so here's an +# over-ride that will allow me to do the operation, even tough the menu +# item is shaded out. +Style "*" HintOverride + +# MWMDecor hints parses the decoration information in the MOTIF_WM_HINTS +# property, and removes these decoratons from the window. This does not affect +# the functions that can be performed via the menus. +Style "*" MWMDecor + +# These are affect minor aspects for the look-and-feel. +# Sub-menus placement mwm-style? +#MWMMenus +# mwm-style border reliefs (less deep than default fvwm) ? +Style "*" MWMBorder +# Maximize button does mwm-inversion thingy +Style "*" MWMButtons +###################################################################### + + +# Leave a band on the right alone? +#EwmhBaseStruts 0 0 0 25 +#EWMHPlacementUseWorkingArea ? + +# I want to lower the main window but leave the small status window visible +Style * !LowerTransient, RaiseTransient, !StackTransientParent + + +###### +# Menu Settings. +# +# * PopupOffset allows you to control where submenus will appear, and +# whether they should overlap or not. +# * This menu uses a translucent Colorset +# * The Menu will look flat, with a 2 pixel border. +# * I changed the default ItemFormat to be a little more spacious. +MenuStyle * MenuFace +MenuStyle * ActiveFore, HilightBack +MenuStyle "*" PopupDelayed, PopupDelay 100, PopdownDelayed, PopdownDelay 200 +MenuStyle * Hilight3DThin, PopupOffset 0 100 +MenuStyle * PopupActiveArea 100 +MenuStyle * BorderWidth 2, TitleUnderlines1, SeparatorsLong, TrianglesSolid, Animation +MenuStyle * ItemFormat "%.2|%.5i%.5l%.5i%2.3>%2|" +MenuStyle * AutomaticHotKeys + + +##### +# Application specific Style settings +# +# You might be interested in the IconOverride style, which will allow you to specify +# an Icon for an application even if it has set its own previously, This can be very +# useful for applications that insist on setting their own icons even if it doesnt +# fit in with your theme :) +# +# You can change most settings for specific applications, based on Name, +# Class or Resource. you can also use wildcards, eg Style "Fvwm*" NoTitle. +################# + +Style "Fvwm*" NoTitle,NoHandles,Sticky,CirculateSkip +Style "Fvwm*" BorderWidth 0, WindowListSkip +Style FvwmCo* Slippery +Style FvwmIdent* Layer 6, WindowListHit ,NoButton 1,NoButton 2, NoButton 4, Title + +#Style FvwmPager* Layer 6 , NoButton 1 , NoButton 2 , TitleAtRight +Style "FvwmPager" WindowListSkip, BorderWidth 0, HandleWidth 0, ParentalRelativity, TitleAtRight + +Style "FvwmBanner" StaysOnTop, FocusFollowsMouse, NoTitle, Sticky, WindowListSkip +Style "FvwmButtons" BorderWidth 5 +Style "FvwmButtons" WindowListSkip,MouseFocus,NoTitle,Sticky +Style "FvwmButtonsPanel" NoTitle, FocusFollowsMouse, NoTitle, Sticky, WindowListSkip +Style FvwmButton* NoButton 1 , NoButton 2 , TitleAtRight +Style FvwmTabs Title + +Style FvwmButtons NeverFocus +Style fvwm_menu ParentalRelativity + +Style FvwmShelf NoTitle, StaysOnBottom, Sticky, WindowListSkip, CirculateSkipIcon, CirculateSkip +Style FvwmShelf HandleWidth 2, NeverFocus +Style DeskControl NoTitle, NeverFocus, CirculateSkip, WindowListSkip, Sticky, StaysOnTop, Layer 7 +Style FvwmBar NoTitle, WindowListSkip, CirculateSkip, Sticky, BorderWidth 1, NoHandles, StaysOnBottom +Style FvwmBar NeverFocus + + +Style OpenOffice* GNOMEIgnoreHints +Style OpenOffice* EWMHIgnoreStackingOrderHints +Style OpenOffice* EWMHIgnoreStateHints +Style OpenOffice* EWMHIgnoreStrutHints +Style OpenOffice* NoPPosition +Style OpenOffice* NoUsposition +Style OpenOffice* FixedPPosition + +Style "Xwall" NoIcon +Style "*BBDB*" NoIcon +Style "*Calendar*" NoIcon +Style "*Compilation*" NoIcon +Style "*Fancy Diary*" NoIcon +Style "*Help*" NoIcon +Style "*Holidays*" NoIcon +Style "*PostScript File" NoTitle +Style "*TeX Shell*" NoIcon +Style "*compilation*" NoIcon +Style "*grep*" NoIcon +Style "*lock" CirculateSkip +Style "*lock" NoTitle, NoHandles, Sticky, WindowListSkip +Style "*x-face*" NoTitle,NoHandles,WindowListSkip +Style "*xfaces*" NoTitle,NoHandles,WindowListSkip +Style "*xbiff" CirculateSkip +Style "*xbiff" NoTitle,NoHandles,Sticky,WindowListSkip +Style "-(Tek)" NoIcon +Style "Appointment" NoButton 2, NoButton 4 +Style "Dali Clock" NoTitle,Sticky,WindowListSkip,NoIcon,CirculateSkip +Style "FRAMEPOP" NoTitle,Sticky,WindowListSkip,CirculateSkip + +Style "FvwmButtons" Sticky, NoTitle,NoHandles,CirculateSkip +Style "Garbage" Title, Handles +Style "Help On PostScript" NoTitle,NoIcon +Style "Information" NoTitle +Style "Load Averages" NoTitle,Sticky,WindowListSkip,CirculateSkip +Style "Message" NoTitle +Style "Work1" Sticky +Style "XClock" NoTitle +Style "XPbiff" NoTitle +Style "dctrl" NoIcon +Style "Dctrl" NoIcon +Style kcalc NoFuncHint, NoDecorHint +Style "pgp-pixie" NoTitle +Style "popup" NoTitle +Style "sunclock" NoTitle,Sticky,WindowListSkip +Style "window info" NoTitle +Style "wmbattery" NoTitle,Sticky,WindowListSkip,CirculateSkip +Style "work1" Sticky +Style "xcb" Sticky,WindowListSkip,CirculateSkip +Style "xcd" NoTitle +Style "xchat" Sticky +Style "xclock" NoTitle,Sticky,WindowListSkip +Style "xconsole" Sticky,WindowListSkip,CirculateSkip +Style "xload" NoTitle,Sticky,WindowListSkip,NoIcon +Style "xmoondial" NoTitle +Style "xmultibiff" CirculateSkip +Style "xmultibiff" NoTitle,Sticky,StaysOnTop,WindowListSkip +Style "xbuffy" CirculateSkip +Style "xbuffy" NoTitle,Sticky,StaysOnTop,WindowListSkip +Style "xticktalk" NoTitle,Sticky,WindowListSkip,CirculateSkip +Style "gkrellm" Sticky, WindowListSkip,CirculateSkip, StaysOnBottom, NeverFocus + +Style XMMS* BorderWidth 0,Icon,GNOMEIgnoreHints +Style XMMS* Sticky,NoTitle,StaysOnTop,NoHandles +Style xmms UseUSPosition, UsePPosition +Style XTerm MiniIcon computer_x11.png +Style Eterm MiniIcon computer_x11.png +Style Emacs TitleAtLeft, LeftTitleRotatedCCW +Style xcalc ClickToFocus +Style xman ClickToFocus, MiniIcon book_help_paper.png +Style xmag ClickToFocus, MiniIcon document_database_view.png +Style Gkrellm2 Sticky, WindowListSkip, StaysOnBottom, NeverFocus +Style opera EWMHMiniIconOverride, MiniIcon opera.png +Style XVroot GrabFocus +Style gmrun MiniIcon gears.png, NoFuncHint, NoDecorHint +Style FvwmIdent MiniIcon label_tag_version.png +Style Calculator MiniIcon calculator.png +Style gcalctool EWMHMiniIconOverride,MiniIcon calculator.png +Style beep-media-player MiniIcon audio_horn.png, UsePPosition +Style xmessage MiniIcon person_face_talking.png +Style xchat-2 !FPFocusByProgram, NoFuncHint, NoDecorHint +Style aterm WindowShadeShrinks +Style rxvt WindowShadeShrinks +Style Mulberry MiniIcon mail.png +Style Message MiniIcon person_face_talking.png +Style VMware MiniIcon hardware_computers.png +Style SDL_App EWMHMiniIconOverride, MiniIcon games_jesters-cap.png +Style XDosEmu EWMHMiniIconOverride, MiniIcon games_jesters-cap.png +Style FvwmScript-Quit MiniIcon plug.png +Style pan !FPFocusByProgram +Style nautilus EWMHMiniIconOverride, MiniIcon floppy_disk.png +Style abiword EWMHMiniIconOverride, MiniIcon document_letter_word-processor.png +Style grip EWMHMiniIconOverride, MiniIcon hardware_audio_cd.png +Style xv MiniIcon graphics_woman_panel.png +Style xwrits NoDecorHint, NoFuncHint +Style gvim EWMHMiniIconOverride, MiniIcon gvim.png +Style Firefox-bin EWMHMiniIconOVerride, MiniIcon firefox.png +Style HiddenConsole Sticky, WindowListSkip, Notitle, StaysOnTop, NoHandles +Style HiddenConsole WindowShadeSteps 100, ResizeHintOverride +Style gaim EWMHMiniIconOverride, MiniIcon instant-messenger.png +Style Ddd MiniIcon audio_waveform_view.png +Style Eboard MiniIcon games_chess.png +Style gimp EWMHMiniIconOverride, MiniIcon graphics_paint_edit.png +Style gimp-2.0 EWMHMiniIconOverride, MiniIcon graphics_paint_edit.png +Style findtextdialog NoFuncHint, NoDecorHint +Style fvwm_menu MiniIcon gears.png, NoButton 4 + + +Style "login" HilightFore White +Style "login" HilightBack #9a5a9187d9da + + +# FlickeringMoveWorkaround disables ConfigureNotify events that +# are usually sent to an application while it is moved. If some +# windows flicker annoyingly while being moved, this option may +# help you. Note that if this problem occurs it is not an fvwm +# bug, it is a problem of the application. + +BugOpts FlickeringMoveWorkaround True + + +# TitleStyle RightJustified + + +TitleStyle Inactive Colorset 51 -- flat +AddTitleStyle Inactive Colorset 52 50 # alpha == 60% here + +ButtonStyle All AllInactive Colorset 51 -- flat +AddButtonStyle All AllInactive Colorset 52 50 + + +ButtonStyle All AllInactive -- !UseTitleStyle flat +TitleStyle Active Colorset 52 -- raised + +ButtonStyle All AllActive -- UseTitleStyle raised + + +BorderStyle -- UseTitleStyle + + +AddToDecor login +#+ TitleStyle TiledPixmap purple-marble.xpm +#+ TitleStyle Inactive TiledPixmap teal.xpm +#+ BorderStyle Active TiledPixmap purple-marble.xpm +#+ BorderStyle Inactive TiledPixmap teal.xpm ++ ButtonStyle 1 5 25x75@0 75x75@0 75x25@0 25x25@1 25x75@1 ++ ButtonStyle 3 5 25x60@0 75x60@0 75x40@0 25x40@1 25x60@1 ++ ButtonStyle 4 5 50x20@1 20x45@1 50x80@1 80x45@0 50x20@0 ++ ButtonStyle 2 4 50x65@1 35x35@1 65x35@1 50x65@0 ++ AddButtonStyle All -- UseTitleStyle ++ TitleStyle RightJustified + +Style XTerm StickyIcon +Style "xterm" HilightFore Black +#Style "xterm" HilightFore #99ffaa +Style "xterm" HilightBack #9a5a9187d9da + +AddToDecor xterm +#+ TitleStyle TiledPixmap purple-marble.xpm +#+ TitleStyle Inactive TiledPixmap grey-marble.xpm.xpm +#+ BorderStyle Active TiledPixmap purple-marble.xpm +#+ BorderStyle Inactive TiledPixmap grey-marble.xpm.xpm ++ ButtonStyle 1 5 25x75@0 75x75@0 75x25@0 25x25@1 25x75@1 ++ ButtonStyle 3 5 25x60@0 75x60@0 75x40@0 25x40@1 25x60@1 ++ ButtonStyle 4 5 50x20@1 20x45@1 50x80@1 80x45@0 50x20@0 ++ ButtonStyle 2 4 50x65@1 35x35@1 65x35@1 50x65@0 ++ AddButtonStyle All -- UseTitleStyle ++ TitleStyle RightJustified + + +# Default +#TitleStyle ActiveUp TiledPixmap purple-marble.xpm +#TitleStyle ActiveDown TiledPixmap purple-marble.xpm +#BorderStyle Active TiledPixmap purple-marble.xpm +DestroyDecor recreate DecorBase +AddToDecor DecorBase ++ TitleStyle Centered --- fvwm-2.5.27.ds.orig/debian/manoj/main-menu.hook +++ fvwm-2.5.27.ds/debian/manoj/main-menu.hook @@ -0,0 +1,123 @@ +# Sub menu for Utilities +AddToMenu "System-Edits" "System Edits" Title ++ "Edit .fvwmrc" Exec emacs_once .fvwmrc & ++ "Edit .xsession" Exec emacs_once .xsession & ++ "Edit .Xresources" Exec emacs_once .Xresources & ++ "Source .Xresources" Exec xrdb -merge .Xresources & ++ "Restart fvwm2" Restart fvwm2 + +PipeRead 'fvwm-menu-desktop --desktop kde-sys' +#PipeRead 'fvwm-menu-xlock --name MenuSSaver --title "Screensaver" \ +# --icon-item mini-bball.xpm --special-first -- -nice 19 -nolock' +#PipeRead 'fvwm-menu-xlock --name MenuSLock --title "Lock Screen" \ +# --icon-item mini-rball.xpm --special-first -- -nice 19 -nolock' + + +AddToMenu "Utilities" +# This menu will fire up some very common utilities ++ "&Apps" Popup /Debian/Apps ++ "&Games" Popup /Debian/Games ++ "&Help" Popup /Debian/Help ++ "&Screen" Popup /Debian/Screen ++ "&WindowManagers" Popup /Debian/WindowManagers ++ "KDE System Menu" Popup kde-sys ++ "Misc" Popup MiscUtilities ++ "Headlines" Popup MenuFvwmHeadlines ++ "&XShells" Popup /Debian/XShells ++ "&Mozilla" Function Warp-or-Run-Browser ++ "Manpage: fvwm%32x32.help.xpm%" Exec exec xterm -g 68x45-0-5 -fn \ + 9x15 -fb 9x15bold -T "Manpage: fvwm2" -n "fvwm2" -e mcview \ + /usr/share/man/man1/fvwm2.1.gz ++ "" Nop ++ "Refresh Screen" Refresh ++ "System Edits" Popup System-Edits ++ "" Nop +#+ "Screensaver%mini-monitor.xpm%" Popup MenuSSaver +#+ "Screenlock%mini-lock.xpm%" Popup MenuSLock ++ "E&xit Fvwm%mini.exit.xpm%" Popup Quit-Verify + + +AddToMenu Misc-Ops "Misc Config Opts" Title ++ "Sloppy Focus" ChangeDefaultFocus SloppyFocus ++ "Click To Focus" ChangeDefaultFocus ClickToFocus ++ "Focus Follows Mouse" ChangeDefaultFocus FocusFollowsMouse ++ "" Nop ++ "Colormap Follows Mouse" ColormapFocus FollowsMouse ++ "Colormap Follows Focus" ColormapFocus FollowsFocus ++ "" Nop ++ "Full Paging ON" EdgeScroll 100 100 ++ "All Paging OFF" EdgeScroll 0 0 ++ "Horizontal Paging Only" EdgeScroll 100 0 ++ "Vertical Paging Only" EdgeScroll 0 100 ++ "Partial Paging" EdgeScroll 50 50 ++ "Full Paging && Edge Wrap" EdgeScroll 100000 100000 + + +DestroyMenu Window-Ops +AddToMenu "Window-Ops" "Windows" Title ++ "work&2%mini.xterm.xpm%" Exec exec uxterm -fg $[fg.cs30] -bg $[bg.cs30] -ut -T Work2 -e /bin/bash & ++ "work&3%mini.xterm.xpm%" Exec exec uxterm -fg $[fg.cs32] -bg $[bg.cs32] -ut -T Work3 -e /bin/bash & ++ "&Root%mini.xterm.xpm%" Exec exec uxterm -fg $[fg.cs33] -bg $[bg.cs33] -T Root -e /bin/su -c '/bin/bash -rcfile "~srivasta/.rootrc" -i' root& ++ "Hidden Console" Function StartHiddenConsole ++ "Window Operations" Title ++ "&Move%mini.move.xpm%" Function Move-or-Raise ++ "Re&size%mini.resize.xpm%" Function Resize-or-Raise ++ "Raise%mini.raise.xpm%" Raise ++ "Lower%mini.lower.xpm%" Lower ++ "(De)&Iconify%mini.iconify.xpm%" Iconify ++ "(Un)&Stick%mini.stick.xpm%" Stick ++ "(Un)Maximize%mini.resize.xpm%" Function max_vert_func ++ "" Nop ++ "Destroy%mini.destroy.xpm%" Destroy ++ "Close%mini.bomb.xpm%" Close ++ "" Nop ++ "ScrollBar" Module FvwmScroll 2 2 ++ "Re&fresh Screen" Refresh ++ "Refresh Window" RefreshWindow ++ "Print" PrintFunction ++ "Print Reverse" PrintReverseFunction + +# "work&2%mini.xterm.xpm%" Exec exec mlterm -f $[fg.cs30] -b $[bg.cs30] -t -T Work2 -e /bin/bash & +# "work&3%mini.xterm.xpm%" Exec exec mlterm -f $[fg.cs32] -b $[bg.cs32] -t -T Work3 -e /bin/bash & +# "&Root%mini.xterm.xpm%" Exec exec mlterm -f $[fg.cs33] -b $[bg.cs33] -t -T Root -e /bin/su -c '/bin/bash -rcfile "~srivasta/.rootrc" -i' root& + + +# A trimmed down version of "Window-Ops", good for binding to decorations +DestroyMenu Window-Ops2 +AddToMenu "Window-Ops2" "Window" Title ++ "&Move%mini.move.xpm%" Function Move-or-Raise ++ "&Resize%mini.resize.xpm%" Function Resize-or-Raise ++ "Raise%mini.raise.xpm%" Raise ++ "&Lower%mini.lower.xpm%" Lower ++ "&Iconify%mini.iconify.xpm" Iconify ++ "(Un)&Stick%mini.stick.xpm%" Stick ++ "Select" Function SelectWindow ++ "Iconify With Thumbnail" Function Thumbnail ++ "Send to &Page..." SendWindowTopage ++ "" Nop ++ "Destroy%mini.destroy.xpm%" Destroy ++ "Close%mini.bomb.xpm%" Close ++ "" Nop ++ "ScrollBar" Module FvwmScroll 2 2 + +DestroyMenu General +AddToMenu "General" "Generic Functions" Title ++ "&Stick" Stick ++ "&All windows" WindowList 0 ++ "&Local windows" WindowList 2 ++ "&Refresh" Refresh ++ "&Next Desk" Desk 1 ++ "Circulate&Up" CirculateUp ++ "Circulate&Down" CirculateDown ++ "Previous Focus" Prev (AcceptsFocus) Focus ++ "Next Focus" Next (AcceptsFocus) Focus ++ "" Nop ++ "m4-Settings" Popup m4-Settings ++ "Bell" Popup Bell ++ "Keyclick" Popup Keyclick ++ "Toggle Paging" Toggle-Page ++ "Paging Functions" Popup Paging ++ "Recapture screen" Recapture ++ "&Forms" Popup Forms ++ "Reset X defaults" Exec xrdb -load $HOME/.Xresources + --- fvwm-2.5.27.ds.orig/debian/manoj/functions.def +++ fvwm-2.5.27.ds/debian/manoj/functions.def @@ -0,0 +1,755 @@ +# +# Section: Menus +# +# This section defines a small menu structure. The main menu contains +# some typical entries, and uses a hook (main-menu.hook) to allow the +# user to add new entries. Most of the default entries are submenus, +# which are also defined here. +# + +#===================================================== 9. user functions +# 9. user functions +# Now define some handy complex functions +DestroyFunc page-and-warp +AddToFunc page-and-warp "I" GotoPage $0 $1 ++ "I" Next [!iconic CurrentScreen CurrentDesk] Focus + +DestroyFunc desk-and-warp +AddToFunc desk-and-warp "I" Desk $0 $1 ++ "I" Next [!iconic CurrentScreen CurrentDesk] Focus + +DestroyFunc Toggle-Page +AddToFunc Toggle-Page "I" EdgeScroll 0 0 ++ "I" EdgeScroll 100 100 + +# use as Key F25 A N Popupat Window-Ops +DestroyFunc Popupat +AddToFunc Popupat "I" CursorMove -1000 -1000 ++ "I" Popup Window-Ops + +#The 'None' line says only do this if no window matching $0 exists. +DestroyFunc MailFunction +AddToFunc MailFunction "I" Next [$0] Iconify -1 ++ "I" Next [$0] focus ++ "I" None [$0] Exec $0 $1 + +DestroyFunc warp-or-run +AddToFunc warp-or-run "I" Next [$0 CirculateHit] Iconify -1 ++ "I" Next [$0 CirculateHit] Focus ++ "I" None [$0] $1 +# Use as + + +# This one moves and then raises the window if you drag the mouse, +# only raises the window if you click, or does a RaiseLower if you double +# click +DestroyFunc "Move-or-Raise" +AddToFunc "Move-or-Raise" "M" Move ++ "M" Raise ++ "C" Raise ++ "D" RaiseLower + +AddToFunc Move-or-Raise2 M Raise ++ M Move ++ D Lower + +AddToFunc PrintFunction I Raise ++ I Exec xdpr -id $w + +# This one moves and then lowers the window if you drag the mouse, +# only lowers the window if you click, or does a RaiseLower if you double +# click +DestroyFunc "Move-or-Lower" +AddToFunc "Move-or-Lower" "M" Move ++ "M" Lower ++ "C" Lower ++ "D" RaiseLower + +# This one moves or (de)iconifies: +DestroyFunc "Move-or-Iconify" +AddToFunc "Move-or-Iconify" "M" Move ++ "D" Iconify ++ "C" Iconify + +# This one resizes and then raises the window if you drag the mouse, +# only raises the window if you click, or does a RaiseLower if you double +# click +DestroyFunc "Resize-or-Raise" +AddToFunc "Resize-or-Raise" "M" Resize ++ "M" Raise ++ "C" Raise ++ "D" RaiseLower + + +# This one maximizes vertically if you click (leaving room for the +# GoodStuff bar at the bottom, or does a full maximization if you +# double click, or a true full vertical maximization if you just +# hold the mouse button down. +DestroyFunc "max_vert_func" +AddToFunc "max_vert_func" "M" Maximize 0 100 ++ "C" Maximize 0 80 ++ "D" Maximize 100 100 + + +# This one maximizes horizontally if you click, or does a full +# maximization if you double click, or a true 80% horizontal +# maximization if you just hold the mouse button down. +DestroyFunc "max_hor_func" +AddToFunc "max_hor_func" "M" Maximize 80 0 ++ "C" Maximize 100 0 ++ "D" Maximize 100 100 + +# This one maximizes if you click, or does a full +# maximization if you double click, or a true 50% maximization if you +# just hold the mouse button down. +DestroyFunc "max_diag_func" +AddToFunc "max_diag_func" "M" Maximize 50 50 ++ "C" Maximize 80 80 ++ "D" Maximize 100 100 + + +# The Focus command no longer raises the window automatically. +# Here is a function that emulates the old Focus behavior. +DestroyFunc focus-and-raise +AddToFunc focus-and-raise "I" Focus ++ "I" Raise ++ "I" WarpToWindow 5p 5p + +DestroyFunc "Goto-Mail" +AddToFunc "Goto-Mail" "I" Desk 0 0 ++ "I" Warp "VM" VM + +# Simulate the Warp function from older fvwm +DestroyFunc Warp +AddToFunc Warp "I" Next $1 Iconify -1 ++ "I" Next $1 focus ++ "I" CursorMove 2 2 + +AddToFunc FocusAndWarp I Focus ++ I WarpToWindow 2p 2p + +AddToFunc DeiconifyFocusAndWarp I Iconify -1 ++ I FocusAndWarp + +AddToFunc ChangeDefaultFocus I Style * $0 ++ I Recapture + +#The "CursorMove" does the trick. I suppose larger values could be +#used to get you to wherever you wanted to be within the window. + +AddToFunc XPMBack "I" Exec xpmroot /usr/local/share/graphics/xpm/$0 +AddToFunc ImageBack "I" Exec xv -root -quit /u/ericding/Pictures/images/$0 + +# AddToFunc Rsh-Func "I" Exec rxterm $0 white:gray30 80x40 $DISPLAY "-cr +# white -title $0 -e ~rod/bin/tcsh -l" + +AddToFunc Iconify-Func "I" Iconify ++ "I" Raise + +DestroyFunc FocusRaise +AddToFunc FocusRaise I Raise ++ I Focus ++ I Iconify off + + +DestroyFunc RestoreWindowGeometry +AddToFunc RestoreWindowGeometry +Read saved-window-geometries Quiet + +DestroyModuleConfig FvwmEvent-NewWindow: * +*FvwmEvent-NewWindow: add_window RestoreWindowGeometry + +AddToFunc StartFunction ++ I Module FvwmEvent FvwmEvent-NewWindow +AddToFunc StartFunction I Module FvwmCommandS +AddToFunc StartFunction ++ I Module FvwmPerl + +DestroyFunc SaveWindowGeometry +AddToFunc SaveWindowGeometry ++ I AddToFunc RestoreWindowGeometry ++ I + I ThisWindow ('$0') ResizeMove $1 $2 $3 $4 ++ I Exec echo "+ I ThisWindow ('$0') ResizeMove $1 $2 $3 $4" >>$[FVWM_USERDIR]/saved-window-geometries + +Key F4 A CS Pick SaveWindowGeometry $[w.name] $[w.x] $[w.y] $[w.width] $[w.height] + +#The plan is this, define a named button in FvwmButtons using Id: +# *FvwmButtons: (Id deskname, Text zero) +#if you use MyGotoDesk instead of GotoDesk, the "zero" in FvwmButtons +#will be automatically replaced with the current desk name. + +AddToFunc MyGotoDesk ++ I GotoDesk $* ++ I PipeRead `echo "SendToModule FvwmButtons ChangeButton deskname Text \ + '\$[desk.name$d]'" + +# AddToFunc MyMove M Move +# Mouse 1 W 4 MyMove + +DestroyFunc Warp-or-Run-Browser +AddToFunc Warp-or-Run-Browser ++ "I" Next ("*Phoenix") Warp-and-Raise ++ "I" TestRc (Match) Break ++ "I" Next ("Galeon") Warp-and-Raise ++ "I" TestRc (Match) Break ++ "I" Next ("Mozilla") Warp-and-Raise ++ "I" TestRc (Match) Break ++ "I" Exec //usr/bin/mozilla + +##### +# Autohide console example: http://dev.gentoo.org/~taviso/screenshots/autohide_console.png +################## +DestroyFunc StartHiddenConsole +AddToFunc StartHiddenConsole ++ I Exec exec rxvt +sb -geometry 144x8+0+0 -name HiddenConsole ++ I Wait HiddenConsole ++ I Next (HiddenConsole) Resize $[vp.width]p 12 ++ I Autohide HiddenConsole 250 0 N + +# XXX: This doesnt change focus, should it? +# Win+H to drop the hidden console down. +DestroyFunc HiddenConsoleKeyBinding +AddToFunc HiddenConsoleKeyBinding ++ I ThisWindow (Shaded) FuncAutoEnter ++ I TestRc (NoMatch) NoWindow FuncAutoEnter + + +DestroyFunc SelectWindow +AddToFunc SelectWindow + + I Focus + + I Raise + + I WarpToWindow 50 50 + +DestroyFunc ScreenDump +AddToFunc ScreenDump ++ I schedule 0 0 exec xwd ++ I schedule 0 ... + +# switches to a window if it is not visible (or not on the current +# page) and which iconifies the window if it is on top on the current +# page (e.g. fully visible). +DestroyFunc FuncFvwmIconifyOrFocusAndRaise +AddToFunc FuncFvwmIconifyOrFocusAndRaise ++ I ThisWindow (Iconic) Iconify off ++ I TestRc (NoMatch) ThisWindow (Raised) Iconify on ++ I ThisWindow (!Iconic) Focus ++ I ThisWindow (!Iconic) Raise + +*FvwmIconMan: action Mouse 1 A sendcommand FuncFvwmIconifyOrFocusAndRaise + +DestroyFunc FullScreen +AddToFunc FullScreen ++ I ThisWindow (!Maximized) Style $n BorderWidth 0 ++ I ThisWindow ( Maximized, !"bluescreen") Style $n BorderWidth 1 ++ I ThisWindow Maximize ++ I ThisWindow (!Maximized) WarpToWindow -5p -5p + +AddToFunc MoveAndGotoPage ++ I Raise ++ I MoveToPage $0 $1 ++ I GotoPage $0 $1 + +#Key Right W CM4 MoveAndGotoPage +1p +0p + +AddToFunc Window-Menu-Func ++ I ThisWindow (HasHandles) Menu Window-Menu Interior 0 0 Close ++ I ThisWindow (!HasHandles) Menu Window-Menu-No-Handles Interior 0 0 Close + +AddToFunc move_to_center ++ I Piperead "echo move $(( ($[vp.width] - $[w.width]) / 2 ))p $(( ($[vp.height] - $[w.height]) / 2 ))p" + +AddToFunc MoveMozilla ++ I WindowID $0 ("*Mozilla*") PipeRead `echo MoveToPage 1 0` + +DestroyFunc SmartStart +AddToFunc SmartStart + + I Next ($0) Iconify off + + I Next ($0) Raise + + I Next (AcceptsFocus, $0) focus + + I None ($0) Exec exec $1 + + +# Auto hide stuff +AddToFunc autohide ++ I ThisWindow ($0) Deschedule $[w.id] ++ I TestRc (!Match) Deschedule -$[w.id] ++ I ThisWindow ($0) ThisWindow (shaded) autohide_show $1 $3 ++ I TestRc (!Match) All ($0, !shaded) autohide_hide $2 $3 + +AddToFunc autohide_show ++ I Schedule $0 -$[w.id] WindowShade $1 off ++ I Schedule $0 -$[w.id] Deschedule $[w.id] ++ I Schedule $0 -$[w.id] Deschedule -$[w.id] + +AddToFunc autohide_hide ++ I Schedule $0 $[w.id] WindowShade $1 on ++ I Schedule $0 $[w.id] Deschedule $[w.id] ++ I Schedule $0 $[w.id] Deschedule -$[w.id] + +AddToFunc StartFunction ++ I Module FvwmAuto FvwmAutohide -menter enter_handler + +#AddToFunc enter_handler +#+ I autohide FvwmButtons 250 500 N +# ^ ^ ^ ^ +# | | | |___ Shade direction (optional) +# | | |________ Hide delay +# | |___________ Show delay +# |_______________________ Unique window name/resource + + + + + + +AddToFunc winame_event ++ I ThisWindow (XTerm) ThisWindow ("*(root@*") Style $n Colorset 1, HilightColorset 7 ++ I ThisWindow (XTerm) ThisWindow ("*(srivasta@*") Style $n Colorset 3, HilightColorset 4 +#*FvwmEvent: window_name winame_event + +#And for the future 2.5.8+ use a more appropriate: +# AddToFunc winame_event +# + I ThisWindow (XTerm) ThisWindow ("*(root@*") WindowStyle Colorset ... +# + I ThisWindow (XTerm) ThisWindow ("*(srivasta@*") WindowStyle Colorset ... + + +AddToFunc SetShadabilityForCertainWindows + + I ThisWindow (Gaim) State 1 + + I ThisWindow (Miag) State 1 + +DestroyFunc StayOnTop-func +AddToFunc StayOnTop-func ++ I Style "$0" StaysOnTop ++ I All ("$0") RecaptureWindow + +DestroyFunc wheel-goes-up +AddToFunc Wheel-goes-up ++ D WindowShade True + +DestroyFunc Wheel-goes-down +AddToFunc Wheel-goes-down ++ D WindowShade False + +DestroyFunc Close-or-kill +AddToFunc Close-or-kill ++ I Raise ++ C Close ++ H Destroy ++ H Beep + +########################################################################## +# Function: Disable ALL buttons +# (This needs to be called when resetting between styles +# with different numbers of buttons) +#========================================================================# +DestroyFunc "RemoveAllButtons" +AddToFunc "RemoveAllButtons" ++ "I" Style "*" NoButton 0, NoButton 1, NoButton 2, NoButton 3, \ + NoButton 4, NoButton 5, NoButton 6, NoButton 7, \ + NoButton 8, NoButton 9 + +DestroyFunc ToggleWindowTitle +AddToFunc ToggleWindowTitle ++ I ThisWindow (State 11) WindowStyle Title ++ I TestRc (!Match) WindowStyle !Title ++ I State 11 toggle + +##### +# You can browse directories and files with the fvwm-menu-directory +# script included with Fvwm, its very configurable (as you might expect!), +# and very useful. +# +# http://www.mail-archive.com/fvwm%40hpc.uh.edu/msg05260.html +################# +DestroyFunc FuncFvwmMenuDirectory +AddToFunc FuncFvwmMenuDirectory ++ I PipeRead 'case "$0" in \ + "$[fvwm_rom_path]"*) myexec="$[fvwm_rom_exec]" \ + mypng=games_puzzles_dice.png;; \ + "$[fvwm_video_path]"*) myexec="$[fvwm_video_exec]" \ + mypng=menu/video.xpm;; \ + "$[fvwm_audio_path]"*) myexec="$[fvwm_audio_exec]" \ + mypng=menu/music.xpm;; \ + "$[fvwm_image_path]"*) myexec="$[fvwm_image_exec]" \ + mypng=menu/viewer.xpm;; \ + esac; \ + fvwm-menu-directory --icon-title menu/folder-open.xpm \ + --icon-app menu/utility.xpm \ + --icon-file ${mypng:-menu/item.xpm} \ + --icon-dir menu/folder.xpm \ + --dir "$0" --xterm exec --exec-file "${myexec:-gvim}"' + +##### +# `Pick` is very handy, if it's obvious which window you're talking about, +# The command is executed immediately within the context of that window. +# +# If it isnt obvious, for example, you select `Move` from the Root menu, the +# cursor becomes a crosshair, and you can select the window you you would like +# to apply the command to by clicking it. +# +# This saves a lot of work, you can use `Pick` with everything that might be +# Called without context and only write one function/menu instead of two. +# +# Note that the Center Window command subtracts (126/2) pixels to make way for my +# Panel. +################# +DestroyMenu FvwmMoveMethods +AddToMenu FvwmMoveMethods ++ "Move to Top" Pick AnimatedMove keep 0p ++ "Move to Left" Pick AnimatedMove 0p keep ++ "Move to Right" Pick PipeRead "echo AnimatedMove $$(($[vp.width] - $[w.width]))p keep" ++ "Move to Bottom" Pick PipeRead "echo AnimatedMove keep $$(($[vp.height] - $[w.height]))p" ++ "" Nop ++ %window.png%"Center Window" Pick PipeRead "echo AnimatedMove $$(((($[vp.width]-$[w.width])/2)-(126/2)))p \ + $$((($[vp.height]-$[w.height])/2))p" ++ "" Nop ++ %hardware_mouse.png%"Pack Up"%alt_sft_up.png% Pick PackWrapperUp ++ %hardware_mouse.png%"Pack Left"%alt_sft_left.png% Pick PackWrapperLeft ++ %hardware_mouse.png%"Pack right"%alt_sft_right.png% Pick PackWrapperRight ++ %hardware_mouse.png%"Pack down"%alt_sft_down.png% Pick PackWrapperDown ++ "" Nop ++ %numbers_counter.png%"Move To Page" Popup MenuPageList ++ "" Nop ++ %hardware_mouse.png%"Interactive Move" Pick Move + +DestroyMenu MenuPageList +AddToMenu MenuPageList ++ "1" Pick MoveToPage 0 0 ++ "2" Pick MoveToPage 1 0 ++ "3" Pick MoveToPage 2 0 ++ "4" Pick MoveToPage 0 1 ++ "5" Pick MoveToPage 1 1 ++ "6" Pick MoveToPage 2 1 ++ "7" Pick MoveToPage 0 2 ++ "8" Pick MoveToPage 1 2 ++ "9" Pick MoveToPage 2 2 + +##### +# Name: PackWindowUp +# Bound: Alt+Shift+Up When a window is active +# Purpose: Interrogate all windows on the current page, find the window with an edge +# closest to active window, and slide the Active window upto that edge, or +# the Page edge, if no window is in the way. +# +# The Wrappers are required to look after the Context while we're testing +# windows. Could also do it with a load of variables, but this is nicer. +# +# See PackWindowLeft for a description of the logic (i know it looks a little +# cryptic). +# +# Sometimes terminals seem to need WindowRefresh, but 99% of the time it just +# works, it creates a little flicker so I'll leave it out until it starts to bug +# me. +# +# Windows are also Raised, you can disable this. +# +################# +DestroyFunc PackWindowUp +AddToFunc PackWindowUp ++ I SetEnv low_w 0 ++ I WindowId $3 Raise ++ I All (CurrentPage !Iconic AcceptsFocus \ + !Shaded) PipeRead "test `expr $[w.y] + $[w.height]` -gt $[low_w] \ + -a `expr $[w.y] + $[w.height]` -lt $0 \ + -a \\( \\( $[w.x] -gt $1 -a $[w.x] -lt `expr $1 + $2` \\) \ + -o \\( $1 -gt $[w.x] -a $1 -lt `expr $[w.x] + $[w.width]` \\) \ + -o \\( $1 -le $[w.x] -a `expr $1 + $2` -ge `expr $[w.x] + $[w.width]` \\) \ + -o \\( $[w.x] -lt $1 -a `expr $[w.x] + $[w.width]` -gt `expr $1 + $2` \\) \ + \\) \ + && echo SetEnv low_w `expr $[w.y] + $[w.height]` \ + || echo Nop" ++ I WindowId $3 AnimatedMove keep $[low_w]p +#+ I WindowId $3 RefreshWindow + +AddToFunc PackWrapperUp I NoWindow PackWindowUp $[w.y] $[w.x] $[w.width] $[w.id] + +##### +# Name: PackWindowDown +# Bound: Alt+Shift+Down When a window is active. +# Purpose: See PackWindowUp. +# +################# +DestroyFunc PackWindowDown +AddToFunc PackWindowDown ++ I SetEnv high_w $[vp.height] ++ I WindowId $3 Raise ++ I All (CurrentPage !Iconic AcceptsFocus \ + !Shaded) PipeRead "test $[w.y] -lt $[high_w] \ + -a $[w.y] -gt `expr $0 + $4` \ + -a \\( \\( $[w.x] -gt $1 -a $[w.x] -lt `expr $1 + $2` \\) \ + -o \\( $1 -gt $[w.x] -a $1 -lt `expr $[w.x] + $[w.width]` \\) \ + -o \\( $1 -le $[w.x] -a `expr $1 + $2` -ge `expr $[w.x] + $[w.width]` \\) \ + -o \\( $[w.x] -lt $1 -a `expr $[w.x] + $[w.width]` -gt `expr $1 + $2` \\) \ + \\) \ + && echo SetEnv high_w $[w.y] \ + || echo Nop" ++ I PipeRead "echo WindowId $3 AnimatedMove keep `expr $[high_w] - $4`p" +#+ I WindowId $3 RefreshWindow + +AddToFunc PackWrapperDown I NoWindow PackWindowDown $[w.y] $[w.x] $[w.width] $[w.id] $[w.height] + +##### +# Name: PackWindowLeft +# Bound: Alt+Shift+Left When a window is active +# Purpose: See PackWindowUp. +# +# The Logic works likes this: +# 1. Set Destination to the Left Edge +# 2. For every window, Run these tests: +# + Is the Window's Right edge further _Right_ than furthest edge seen yet? +# And: + Is it's Right edge Further _Left_ than Target Windows Left edge? (ie, in the way) +# Yes: +# + Does the window start inside Target Window, and end below? +# Or + Does it start above, and end inside? +# Or + Is it the same vertical position/height/size, or start inside and end inside? +# Or + Does it start above, and end below? +# Yes: +# This is the new Destination. +# No: +# Nop +# No: +# Nop +# 3. Move to Destination. +# +################# +DestroyFunc PackWindowLeft +AddToFunc PackWindowLeft ++ I SetEnv left_w 0 ++ I WindowId $3 Raise ++ I All (CurrentPage !Iconic AcceptsFocus \ + !Shaded) PipeRead "test `expr $[w.x] + $[w.width]` -gt $[left_w] \ + -a `expr $[w.x] + $[w.width]` -lt $1 \ + -a \\( \\( $[w.y] -gt $0 -a $[w.y] -lt `expr $0 + $4` \\) \ + -o \\( $[w.y] -lt $0 -a `expr $[w.y] + $[w.height]` -gt $0 \\) \ + -o \\( $[w.y] -ge $0 -a `expr $[w.y] + $[w.height]` -le `expr $0 + $4` \\) \ + -o \\( $[w.y] -lt $0 -a `expr $[w.y] + $[w.height]` -gt `expr $0 + $4` \\) \ + \\) \ + && echo SetEnv left_w `expr $[w.x] + $[w.width]` \ + || echo Nop" ++ I WindowId $3 AnimatedMove $[left_w]p keep +#+ I WindowId $3 RefreshWindow + +AddToFunc PackWrapperLeft I NoWindow PackWindowLeft $[w.y] $[w.x] $[w.width] $[w.id] $[w.height] + +DestroyFunc PackWindowRight +AddToFunc PackWindowRight ++ I SetEnv right_w $[vp.width] ++ I WindowId $3 Raise ++ I All (CurrentPage !Iconic AcceptsFocus \ + !Shaded) PipeRead "test $[w.x] -lt $[right_w] \ + -a $[w.x] -gt `expr $1 + $2` \ + -a \\( \\( $[w.y] -gt $0 -a $[w.y] -lt `expr $0 + $4` \\) \ + -o \\( $[w.y] -lt $0 -a `expr $[w.y] + $[w.height]` -gt $0 \\) \ + -o \\( $[w.y] -ge $0 -a `expr $[w.y] + $[w.height]` -le `expr $0 + $4` \\) \ + -o \\( $[w.y] -lt $0 -a `expr $[w.y] + $[w.height]` -gt `expr $0 + $4` \\) \ + \\) \ + && echo SetEnv right_w $[w.x] \ + || echo Nop" ++ I PipeRead "echo WindowId $3 AnimatedMove `expr $[right_w] - $2`p keep" +#+ I WindowId $3 RefreshWindow + +AddToFunc PackWrapperRight I NoWindow PackWindowRight $[w.y] $[w.x] $[w.width] $[w.id] $[w.height] + +##### +# Name: WheelToggleShade +# Bound: Mouse Buttons 4 and 5 (wheel up and down) on Titlebars +# Purpose: Shade or unshade the window when the Mouse wheel is rolled up or +# down on the Titlebar. Rolling the Wheel up calls the Function with +# argument `True` and rolling it down uses `False`, so rolling the wheel +# down when the window isnt shaded has no effect, which I like :) +# +################# +DestroyFunc WheelToggleShade +AddToFunc WheelToggleShade D WindowShade $0 + +##### +# Name: DestroyOnHold +# Bound: Titlebar Button 2 (X) +# Purpose: When clicked, Raise the window Immediately. +# If the button is pressed and released, Close the Window. If it is pressed +# and held, Destroy it, and issue a Beep to confirm. +# +# There is a 100ms delay before issuing `Close` so I have a chance to see the +# animation when the button changes from ActiveDown to ActiveUp :). +# +################# +DestroyFunc DestroyOnHold +AddToFunc DestroyOnHold I Raise ++ C Schedule 100 Close ++ H Destroy ++ H Beep + + +##### +# Name: Thumbnail +# Purpose: Iconify a window with a reduced screenshot of the application +# Window, looks really cool. +# +# Uses FvwmEvent to remove the Icon when deiconified. +# +# Thumbnailing example: +# +# http://www.fvwm.org/screenshots/desktops/Tavis_Ormandy-desk-1152x864/screenshot.jpg +# +# If you have a slow machine, try changing -scale to -sample, the quality of the Icons +# won't be as good, but they are generated much faster. +# +################## +DestroyFunc Thumbnail +AddToFunc Thumbnail ++ I Raise ++ I SetEnv Icon-$[w.id] $[w.iconfile] ++ I ThisWindow (!Shaded Iconifiable !Iconic) PipeRead \ + "xwd -silent -id $[w.id] | convert -scale $[fvwm_icon_size] -frame 1x1 \ + -mattecolor black -quality 0 xwd:- png:$[HOME]/tmp/icon.tmp.$[w.id].png \ + && echo WindowStyle IconOverride, Icon $[HOME]/tmp/icon.tmp.$[w.id].png \ + || echo Nop" ++ I TestRc (Match) Test (f $[HOME]/icons/$[w.miniiconfile]) PipeRead "composite -geometry +2+4 \ + $[fvwm_image_path]/icons/$[w.miniiconfile] $[HOME]/tmp/icon.tmp.$[w.id].png \ + $[HOME]/tmp/icon.tmp.$[w.id].png && echo Nop \ + || echo Beep" ++ I Iconify + +# XXX: No need for NoIconOverride. +DestroyFunc DeThumbnail +AddToFunc DeThumbnail ++ I PipeRead "echo WindowStyle Icon \\$\\[Icon-$[w.id]\\]" ++ I UnsetEnv Icon-$[w.id] ++ I Exec exec rm -f $[HOME]/tmp/icon.tmp.$[w.id].png + +*FvwmEvent: deiconify DeThumbnail + +DestroyFunc IconifyWithScreenshot +AddToFunc IconifyWithScreenshot ++ I echo "Iconnify running" ++ I Raise ++ I PipeRead "import -geometry 64 -frame -resize 64 -silent -window $[w.id] $[HOME]/.fvwm/icon.tmp.$[w.id].png && echo WindowStyle IconOverride, Icon $[HOME]/.fvwm/icon.tmp.$[w.id].png || echo Nop" ++ I Iconify + +# FIXME: Make this more useful. +# XXX: This doesnt do much yet, you can play with it if you like. +# Example: http://dev.gentoo.org/~taviso/fvwm_expose.png +DestroyFunc FvwmExpose +AddToFunc FvwmExpose ++ I AddToMenu FvwmExposeMenu ".: e x p o s e :." Title ++ I All (!Iconic !Shaded CurrentPage AcceptsFocus)\ + PipeRead "echo Raise; \ + xwd -silent -id $[w.id] | convert -scale $[fvwm_icon_size] -quality 0 xwd:- \ + png:$[HOME]/tmp/icon.exp.$[w.id].png \ + && echo AddToMenu FvwmExposeMenu \ + %$[HOME]/tmp/icon.exp.$[w.id].png%\\\'\"$[w.name]\"\\\' WindowID $[w.id] WarpToWindow 50 50 \ + && echo AddToMenu FvwmExposeMenu \\\"\\\" Nop \ + || Nop" ++ I Popup FvwmExposeMenu ++ I DestroyMenu FvwmExposeMenu ++ I Exec exec rm -f $[HOME]/tmp/icon.exp.* + +# Fvwm uses this function when selecting windows from the WindwList command +# you can make this function do any thing you like, it is executed in the context +# of the selected window. +AddToFunc WindowListFunc I WarpToWindow 50 50 + +DestroyFunc FuncAutoEnter +AddToFunc FuncAutoEnter I Autohide HiddenConsole 250 500 N + +# Example: http://dev.gentoo.org/~taviso/screenshots/browsewall.png +# XXX: Slooooow at first run. +DestroyFunc WallpaperBrowser +AddToFunc WallpaperBrowser ++ I AddToMenu WallpaperBrowserMenu DynamicPopDownAction DestroyMenu WallpaperBrowserMenu ++ I PipeRead 'cd $[fvwm_wallpaper_dir]; \ + test ! -d "$[fvwm_wallpaper_dir]/.thumbs" && mkdir "$[fvwm_wallpaper_dir]/.thumbs"; echo >&2 "dir = $[fvwm_wallpaper_dir]/.thumbs"; \ + for i in "$[fvwm_wallpaper_dir]/"*; do \ + test -f "$[fvwm_wallpaper_dir]/.thumbs/${i##*/}" \ + -a "${i}" -ot "$[fvwm_wallpaper_dir]/.thumbs/${i##*/}" || { \ + convert -quality 0 -scale 32 "${i}" "png:$[fvwm_wallpaper_dir]/.thumbs/${i##*/}" 2>/dev/null \ + || continue; \ + }; \ + printf "+ %%\\"%s\\"%%\\"%s\\" Exec exec fvwm-root -r %s\\n" \ + "$[fvwm_wallpaper_dir]/.thumbs/${i##*/}" "${i##*/}" "${i}"; \ + done' + +#### +# These functions modified from the functions provided in the fvwm FAQ. +# http://www.fvwm.org/documentation/faq/#7.17 +################# +AddToFunc Autohide ++ I ThisWindow ($0) Deschedule $[w.id] ++ I TestRc (!Match) Deschedule -$[w.id] ++ I ThisWindow ($0) ThisWindow (shaded) AutohideShow $1 $3 ++ I TestRc (!Match) All ($0, !shaded) AutohideHide $2 $3 + +AddToFunc AutohideShow ++ I Schedule $0 -$[w.id] WindowShade $1 off ++ I Schedule $0 -$[w.id] Raise ++ I Schedule $0 -$[w.id] Deschedule $[w.id] ++ I Schedule $0 -$[w.id] Deschedule -$[w.id] + +AddToFunc AutohideHide ++ I Schedule $0 $[w.id] WindowShade $1 on ++ I Schedule $0 $[w.id] Deschedule $[w.id] ++ I Schedule $0 $[w.id] Deschedule -$[w.id] + +DestroyFunc . +AddToFunc . ++ I SendToModule FvwmPerl preprocess -c -- $* + +DestroyFunc SendWindowToPage +AddToFunc SendWindowToPage ++ I SetEnv LAST_WIN_ID $[w.id] ++ I . FvwmButtons -g 144x96+%{$[pointer.x]-$[page.nx]*36-34}%+%{$[pointer.y]-$[page.ny]*24-20}% -transient GridButtons + +DestroyFunc MoveLastWindowToPage +AddToFunc MoveLastWindowToPage ++ I WindowId $[LAST_WIN_ID] MoveToPage $0 $1 + +DestroyFunc CenterViewportOnWindow +AddToFunc CenterViewportOnWindow ++ I FlipFocus ++ I WarpToWindow 50 50 ++ I PipeRead "echo Scroll $$((((-$[vp.width]/2)+$[pointer.x])))p $$(((-($[vp.height]/2)+$[pointer.y])))p + +# To warp to the top left corner of a window without switching pages +# you can use + +AddToFunc my_warptowindow ++ I WindowId root 0 WarpToWindow $[w.x]p $[w.y]p + +DestroyFunc SnapshotAllWindows +AddToFunc SnapshotAllWindows ++ I GotoDesk 0 ++ I GotoPage 0 0 ++ I PipeRead `import -window root /tmp/desktop-000.png >/dev/null` ++ I GotoPage 0 1 ++ I PipeRead `import -window root /tmp/desktop-001.png >/dev/null` ++ I GotoPage 1 0 ++ I PipeRead `import -window root /tmp/desktop-010.png >/dev/null` ++ I GotoPage 1 1 ++ I PipeRead `import -window root /tmp/desktop-011.png >/dev/null` ++ I GotoDesk 1 ++ I GotoPage 0 0 ++ I PipeRead `import -window root /tmp/desktop-100.png >/dev/null` ++ I GotoPage 0 1 ++ I PipeRead `import -window root /tmp/desktop-101.png >/dev/null` ++ I GotoPage 1 0 ++ I PipeRead `import -window root /tmp/desktop-110.png >/dev/null` ++ I GotoPage 1 1 ++ I PipeRead `import -window root /tmp/desktop-111.png >/dev/null` + + + +DestroyFunc Screenshot +AddToFunc Screenshot ++ I PipeRead `for ((x=0; x < $[desk.pagesx]; x++)); do \ + for ((y=0; y < $[desk.pagesy]; y++)); \ + do \ + echo GotoPage ${x} ${y}; \ + xwd -root -silent -out $[FVWM_USERDIR]/page_${x}_${y}.xwd; \ + done; \ + done; \ + montage -geometry $[vp.width]x$[vp.height] -tile \ + $[desk.pagesx]x$[desk.pagesy] $[FVWM_USERDIR]/page_*_*.xwd \ + png:$[HOME]/screenshot.png; rm -f $[FVWM_USERDIR]/page_*_*.xwd ` + +Key F12 A S Screenshot + --- fvwm-2.5.27.ds.orig/debian/manoj/.fvwm2rc +++ fvwm-2.5.27.ds/debian/manoj/.fvwm2rc @@ -0,0 +1,52 @@ +#!/usr/bin/fvwm + +Read colorsets + +# Section: pre.hook +# +# Use pre.hook for things that need to be done before anything else. +# For example, a PixmapPath might be defined here. +# +Read pre.hook + +Read functions.def + +# +# Section: Menus +# +# This section defines a small menu structure. The main menu contains +# some typical entries, and uses a hook (main-menu.hook) to allow the +# user to add new entries. Most of the default entries are submenus, +# which are also defined here. + +# +# Read in system and user menu definitions. +# +Read "headlines" +Read /etc/X11/fvwm/menudefs.hook +Read menudefs.hook +FvwmM4 m4menus.hook +Read post_menu.hook + +Read buttons.hook +Read binding.hook + +#===================================================== E. modules +Read FvwmButtons.hook +Read FvwmModules.hook +#Read FvwmAnimate.hook +Read FvwmAuto.hook + +# +# Section: post.hook +# +# Use post.hook to force things that may have been changed earlier, for +# example, key bindinds. +# + +Read post.hook +Read style.hook + +#===================================================== 7. icons +# 7. icons +Read icons --- fvwm-2.5.27.ds.orig/debian/manoj/icons +++ fvwm-2.5.27.ds/debian/manoj/icons @@ -0,0 +1,510 @@ +### +# Known applications +### + +# Setting window style icons; style is defined by window name/resource/class. +# Note, todo can be replaced by unknown or empty, but since it is beta yet, +# todo is a notice to do something about an icon for this application. + +Style "Kazaa*" IconOverride, Icon norm/file-manager.xpm +Style "wine" IconOverride, Icon norm/file-manager.xpm +Style "*" Icon norm/unknown.xpm,MiniIcon mini/unknown.xpm +Style "NoResource" Icon norm/unknown.xpm,MiniIcon mini/unknown.xpm + +# Terminals +Style "Eterm*" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "rxvt" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "XTerm" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm + +# These are not all mine, most of globs must be removed. +Style "DDD*" Icon norm/developement.xpm,MiniIcon mini/developement.xpm +Style "GRASP*" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "HyTeX*" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "ImageMagic*" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm +Style "KDisk*" Icon norm/disk.xpm,MiniIcon mini/disk.xpm +Style "LyX" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "MathSpad*" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "MuPAD*" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "StarOffice*" Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm +Style "SystemInfo*" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "Tk man" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "Visual Tcl" Icon norm/todo.xpm,MiniIcon mini/todo.xpm +Style "Information" Icon norm/information.xpm,MiniIcon mini/information.xpm + +Style "amaya*" Icon norm/www.xpm,MiniIcon mini/www.xpm +Style "AcroRead" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "Appointment" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "asWedit*" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "bitmap*" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm +Style "?calc" Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm +Style "?clock" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "cooledit" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "control*" Icon norm/home.xpm,MiniIcon mini/home.xpm +Style "Dayview" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "Dialogue" Icon norm/www.xpm,MiniIcon mini/www.xpm +Style "Display" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "dosemu*" Icon norm/todo.xpm,MiniIcon mini/todo.xpm +Style "Image Viewer*" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "emacs" Icon norm/gnu.xpm,MiniIcon mini/gnu.xpm +Style "Explorer" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "Fractine" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "fr" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "freeamp" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "File Viewer*" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "Fvwm*" Icon norm/utility.xpm,MiniIcon mini/utility.xpm +Style "ghostview" Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm +Style "ghostscript" Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm +Style "gifview" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "GNUplot" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "GV" Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm +Style "Help_popup" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "ixset" Icon norm/todo.xpm,MiniIcon mini/todo.xpm +Style "Lynx" Icon norm/www.xpm,MiniIcon mini/www.xpm +Style "Manual Page*" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "matlab" Icon norm/science.xpm,MiniIcon mini/science.xpm +# too general +Style "Midnight-Commander" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "mgv*" Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm +Style "moxfm*" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "mtools*" Icon norm/disk.xpm,MiniIcon mini/disk.xpm +Style "mxaudio" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "NEdit*" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "nedit*" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "Netscape" Icon norm/netscape.xpm,MiniIcon mini/netscape.xpm +Style "Mozilla-bin" Icon norm/netscape.xpm,MiniIcon mini/netscape.xpm +Style "Download" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "Mail" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "Composition" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "NcFtp" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "nscal*" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "News" Icon norm/news.xpm,MiniIcon mini/news.xpm +Style "panel" Icon norm/home.xpm,MiniIcon mini/home.xpm +Style "pine" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "pixmap*" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm +Style "qps*" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "sxpm" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "Tail File*" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "textedit" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "thot*" Icon norm/www.xpm,MiniIcon mini/www.xpm +Style "THX-1138" Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm +Style "timidity" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "Top" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +Style "usernet" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "VIM" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "VI" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "vppp*" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "conx" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "vmware" Icon norm/utility.xpm,MiniIcon mini/utility.xpm +Style "wmCalClock" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "workman" Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm +Style "X11Amp" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "X3270xad" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "xanim" Icon norm/multimedia.xpm,MiniIcon mini/multimedia.xpm +Style "xapm" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +Style "xbiff" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "xbm*" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "XbmBrowser" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "xclipboard" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "xcolorsel" Icon norm/colors.xpm,MiniIcon mini/colors.xpm +Style "xconsole" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "xdaliclock" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "xdiskinfo*" Icon norm/disk.xpm,MiniIcon mini/disk.xpm +Style "xditview" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "XDos*" Icon norm/todo.xpm,MiniIcon mini/todo.xpm +Style "xedit" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "xephem*" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "xfig*" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm +Style "xfontsel" Icon norm/font.xpm,MiniIcon mini/font.xpm +Style "xgraph" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "xkey*" Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm +Style "xli" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "xload" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +# -- [ xman resources -- +Style "Xman" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "topBox" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "manualBrowser" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "help" Icon norm/information.xpm,MiniIcon mini/information.xpm +# -- xman resources ] -- +Style "xmag" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "Xmessage" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "xosview" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +# -- [ xpaint resources -- +Style "XPaint" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm +Style "Canvas" Icon norm/todo.xpm,MiniIcon mini/todo.xpm +Style "fatbits" Icon norm/todo.xpm,MiniIcon mini/todo.xpm +Style "filebrowser" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +# -- xpaint resources ] -- +Style "xmh" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "xmixer" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "xmms" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "xpdf" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "xplaycd" Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm +Style "xscreensaver" Icon norm/lock.xpm,MiniIcon mini/lock.xpm +Style "xsysinfo*" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "xtar*" Icon norm/file.xpm,MiniIcon mini/file.xpm +Style "XTel" Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm +Style "XTide" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "xv" Icon norm/xv.xpm,MiniIcon mini/xv.xpm +Style "xvgr" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "xvmount" Icon norm/disk.xpm,MiniIcon mini/disk.xpm +Style "xwp" Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm +Style "xwpe" Icon norm/developement.xpm,MiniIcon mini/developement.xpm +Style "xxgdb" Icon norm/developement.xpm,MiniIcon mini/developement.xpm + +# Open File dialog +Style "Browse * Select a File" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "File Directory" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "fileSelector*" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "fileSelection_popup" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "Open document" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "Save as" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "Select a file to open" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "Select a file to load" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "selFile" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "Open File..." Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "xgetfile" Icon norm/folder.xpm,MiniIcon mini/folder.xpm + +# Too general +Style "*_applet" Icon norm/utility.xpm,MiniIcon mini/utility.xpm +Style "help*" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "*icq" Icon norm/chat.xpm,MiniIcon mini/chat.xpm +Style "*irc" Icon norm/chat.xpm,MiniIcon mini/chat.xpm +Style "*info" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "info*" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "Information" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "_o_*" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "About" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "about_popup" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "about" Icon norm/information.xpm,MiniIcon mini/information.xpm + +# FVWM / FVWM Themes +Style "Fvwm*" Icon norm/utility.xpm,MiniIcon mini/utility.xpm +Style "FvwmConsole" Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm +Style "FVWM Themes*" Icon norm/themes.xpm,MiniIcon mini/themes.xpm +Style "FVWM Themes Config*" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm +Style "FVWM Themes Doc*" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "FVWM Themes Menu*" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "Color Selector" Icon norm/colors.xpm,MiniIcon mini/colors.xpm +Style "Font Selector" Icon norm/font.xpm,MiniIcon mini/font.xpm +Style "Icon Browser" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "Image Browser" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "FvwmForm-ThemeSettings" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm +Style "FvwmForm-Restart" Icon norm/restart.xpm,MiniIcon mini/restart.xpm +Style "FormFvwmAnimate" Icon norm/window-iconify.xpm,MiniIcon mini/window-iconify.xpm +Style "FvwmForm-Form" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm +Style "FvwmForm-RootCursor" Icon norm/display.xpm,MiniIcon mini/display.xpm +Style "FvwmScript-BellSetup" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "FvwmScript-Keyboard" Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm +Style "FvwmScript-ScreenSetup" Icon norm/display.xpm,MiniIcon mini/display.xpm +Style "FvwmScript-PointerSetup" Icon norm/mouse.xpm,MiniIcon mini/mouse.xpm + +# GNOME/Gtk Apps +Style "AbiWord*" Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm +Style "bug-buddy" Icon norm/developement.xpm,MiniIcon mini/developement.xpm +Style "Dia" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "eog" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "Galeon-bin" Icon norm/www.xpm,MiniIcon mini/www.xpm +Style "galeon*" Icon norm/www.xpm,MiniIcon mini/www.xpm +Style "gcharmap" Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm +Style "gcolorsel" Icon norm/colors.xpm,MiniIcon mini/colors.xpm +Style "gdict" Icon norm/utility.xpm,MiniIcon mini/utility.xpm +Style "gdiskfree" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +Style "gEdit" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "gedit" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "gfontsel" Icon norm/font.xpm,MiniIcon mini/font.xpm +Style "gfloppy" Icon norm/disk-floppy.xpm,MiniIcon mini/disk-floppy.xpm +Style "ghex" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "ghostview" Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm +Style "Gimp" Icon norm/gimp.xpm,MiniIcon mini/gimp.xpm +Style "gaim*" Icon norm/chat.xpm +Style "eDonkey*" Icon norm/monitoring.xpm +Style "*GVIM" Icon norm/editor.xpm +Style "gless" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "gmix" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "gmailman" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "gmc" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "gmenu" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm +Style "gnome-help-browser" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "GnomeHelpBrowser" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "gnome-hint" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "gnome-ppp" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "gnome-run" Icon norm/utility.xpm,MiniIcon mini/utility.xpm +Style "gnome-sync" Icon norm/folder.xpm,MiniIcon mini/folder.xpm +Style "Gnome-linuxconf" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm +Style "gnomecal" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "GnomeCard" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "gnomecard" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "gnomecc" Icon norm/home.xpm,MiniIcon mini/home.xpm +Style "GnomeTerminal" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "gnumeric" Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm +Style "gnp" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "gnp+" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "GQview" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "grecord" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "grip" Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm +Style "gsearchtool" Icon norm/file.xpm,MiniIcon mini/file.xpm +Style "gtalk" Icon norm/chat.xpm,MiniIcon mini/chat.xpm +Style "gtcd" Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm +Style "gtk-shell" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "gtkicq" Icon norm/chat.xpm,MiniIcon mini/chat.xpm +Style "gtop" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +Style "gtt" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "guname" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "gw" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +Style "gxedit" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "helix-update" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "idetool" Icon norm/disk.xpm,MiniIcon mini/disk.xpm +Style "logview" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "pan" Icon norm/news.xpm,MiniIcon mini/news.xpm +Style "vumeter" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "X-Chat" Icon norm/chat.xpm,MiniIcon mini/chat.xpm + +# XFCE Apps +Style "xfclock" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "xftree" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm + +# KDE Apps +# -- [ Abbrowser -- +Style "kcontrol" Icon norm/kde.xpm,MiniIcon mini/kde.xpm +Style "abbrowser" Icon norm/information.xpm,MiniIcon mini/information.xpm +# -- Abbrowser ] -- +Style "aktion" Icon norm/video.xpm,MiniIcon mini/video.xpm +Style "ark" Icon norm/file.xpm,MiniIcon mini/file.xpm +# -- [ kviewshell -- +Style "kviewshell" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "DVI Viewer" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "Fax Viewer" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +# -- kviewshell ] -- +Style "kab" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "kaiman" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "karm" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "kcharselect" Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm +Style "kchart" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "kcron" Icon norm/system.xpm,MiniIcon mini/system.xpm +Style "kdehelp" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "kdepasswd" Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm +Style "kdevelop" Icon norm/developement.xpm,MiniIcon mini/developement.xpm +Style "kdesu" Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm +Style "kdf" Icon norm/disk.xpm,MiniIcon mini/disk.xpm +Style "kdvi" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "kedit" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "keystone" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "kfind" Icon norm/file.xpm,MiniIcon mini/file.xpm +Style "kfloppy" Icon norm/disk-floppy.xpm,MiniIcon mini/disk-floppy.xpm +Style "kfm" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "kfract" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "khexedit" Icon norm/file.xpm,MiniIcon mini/file.xpm +Style "kiconedit" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm +Style "kit" Icon norm/chat.xpm,MiniIcon mini/chat.xpm +Style "killustrator" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "kjots" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "klpq" Icon norm/printing.xpm,MiniIcon mini/printing.xpm +Style "kljettool" Icon norm/printing.xpm,MiniIcon mini/printing.xpm +Style "knode" Icon norm/news.xpm,MiniIcon mini/news.xpm +Style "knews" Icon norm/news.xpm,MiniIcon mini/news.xpm +Style "kmail*" Icon norm/mail.xpm,MiniIcon mini/mail.xpm +Style "kmidi" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "kmid" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "kmix" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "artsbuilder" Icon norm/music.xpm,MiniIcon mini/music.xpm +Style "artscontrol" Icon norm/sound.xpm,MiniIcon mini/sound.xpm +Style "kmoon" Icon norm/science.xpm,MiniIcon mini/science.xpm +Style "kodo" Icon norm/mouse.xpm,MiniIcon mini/mouse.xpm +Style "kpackage" Icon norm/program.xpm,MiniIcon mini/program.xpm +Style "kppp" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "kppplogview" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "kghostview" Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm +Style "konqueror" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "korganizer" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "konsole" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "koshell" Icon norm/home.xpm,MiniIcon mini/home.xpm +Style "kpixmap2bitmap" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "kpm" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +Style "kpresenter" Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm +Style "krule" Icon norm/utility.xpm,MiniIcon mini/utility.xpm +Style "kscd" Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm +Style "ksnapshot" Icon norm/window.xpm,MiniIcon mini/window.xpm +Style "kspread" Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm +Style "ksysguard" Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm +Style "ksysv" Icon norm/system.xpm,MiniIcon mini/system.xpm +Style "kteatime" Icon norm/amusement.xpm,MiniIcon mini/amusement.xpm +Style "ktip" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "kuser" Icon norm/system.xpm,MiniIcon mini/system.xpm +Style "kview" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm +Style "kvt" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "kwikdisk" Icon norm/disk.xpm,MiniIcon mini/disk.xpm +Style "kword" Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm +Style "kworldwatch" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "kwrite" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "kwuftpd" Icon norm/network.xpm,MiniIcon mini/network.xpm +Style "noatun" Icon norm/multimedia.xpm,MiniIcon mini/multimedia.xpm +Style "pixie" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm + +# CDE Apps +Style "Dterm" Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm +Style "Dtfile" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm +Style "Dtpad" Icon norm/editor.xpm,MiniIcon mini/editor.xpm +Style "Dthelp*" Icon norm/help.xpm,MiniIcon mini/help.xpm +Style "Dtcm*" Icon norm/clock.xpm,MiniIcon mini/clock.xpm +Style "Dtcalc" Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm +Style "Dticon*" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm +Style "Dtprint*" Icon norm/printing.xpm,MiniIcon mini/printing.xpm +Style "Dtstyle*" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm +Style "Applications Manager" Icon norm/program.xpm,MiniIcon mini/program.xpm +Style "Trash Can" Icon norm/file.xpm,MiniIcon mini/file.xpm + +# Games +Style "SDL_App" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "*angband" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "gcfclient" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "Maelstrom" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "MirrorMagic" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "PySol" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm +Style "Rocks'n'Diamonds" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "XGammon" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "XGammon-Buttons" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "xgoban" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "comment" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "xmahjongg" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "*tetris" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "xtrojka" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "xemeraldia" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "XGalaga" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "xeyes" Icon norm/amusement.xpm,MiniIcon mini/amusement.xpm + +# 11 xpuzzles +Style "xcubes" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xdino" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xhexagons" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xmball" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xmlink" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xoct" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xpanex" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xpyraminx" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xrubik" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xskewb" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xtriangles" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm + +Style "High score*" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "Statistics" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "xboard" Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm +Style "xevil" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "xsok*" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "xbomb" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "*Scavenger" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "Freeciv*" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "XPat" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm +Style "dontspace" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm +Style "klondike" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm +Style "spider" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "X-Mame*" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "xlin-city*" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "xchomp" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm + +# GNOME Games +Style "freecell" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm +Style "gataxx" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "glines" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "gnibbles" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "gnobots" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "gnobots2" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "gnome-chess" Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm +Style "gnome-stones" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "gnome-xbill" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "gnomine" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "gnotski" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "gtali" Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm +Style "gnotravex" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "gturing" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "iagno" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "mahjongg" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "same-gnome" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "sol" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm + +Style "gtkballs" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "gfpoken" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm + +# KDE Games # these ones have own 16x16 & 32x32 xpm's included with kdebase +Style "Jezzball" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "lskat" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "kabalone" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "kasteroids" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "katomic" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "kbackgammon" Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm +Style "kblackbox" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "kfouleggs" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "kjumpingcube" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "kmahjongg" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "kmines" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "konquest" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "kpat" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm +Style "kpoker" Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm +Style "kreversi" Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm +Style "ksame" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "kshisen" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "ksirtet" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "ksmiletris" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "ksnake" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "ksokoban" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm +Style "kspaceduel" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "ktron" Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm +Style "ktetris" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "ktuberling" Icon norm/game.xpm,MiniIcon mini/game.xpm +Style "kwin4" Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm + + +Style "FvwmButtons" Icon toolbox.xpm +Style "Mosaic" Icon norm/netscape.xpm,MiniIcon mini/netscape.xpm +Style "Root" Icon supermn1.xpm,MiniIcon mini/terminal.xpm +Style "root*" Icon supermn1.xpm,MiniIcon mini/terminal.xpm +Style "VM" Icon mail_edit.xpm,MiniIcon mini/mail.xpm +Style "Work2" Icon hpterm.xpm,MiniIcon mini/terminal.xpm +Style "work2" Icon hpterm.xpm,MiniIcon mini/terminal.xpm +Style "XArchie" Icon xarchie.xpm,MiniIcon mini/network.xpm +Style "XGopher" Icon xgopher.xpm,MiniIcon mini/network.xpm +Style "XGrab" Icon xgrab.xpm,MiniIcon mini/image-processor.xpm +Style "XRn" Icon xrn.xpm,MiniIcon mini/news.xpm +Style "postit" Icon postit.xpm,MiniIcon mini/information.xpm +Style "xcb" Icon clipboard.xpm,MiniIcon mini/information.xpm +Style "xcd" Icon cdrom1.xpm,MiniIcon mini/cd-player.xpm +Style "xman" Icon xman.xpm,MiniIcon mini/information.xpm +Style "xmanSearch" Icon ctwm/xman.xpm,MiniIcon mini/information.xpm +Style "xterm" Icon xterm.xpm,MiniIcon mini/terminal.xpm + +Style "xinfo" Icon cl-32/gnuinfo.xpm,MiniIcon mini/information.xpm +Style "XInfo" Icon cl-32/gnuinfo.xpm,MiniIcon mini/information.xpm + +Style "pgp-pixie" Icon hobbes-icons-xpm3/l/lock1.xpm,MiniIcon mini/lock.xpm +Style "xdvi" Icon /usr/local/share/graphics/texicons/xpm/dvi.xpm,MiniIcon mini/viewer.xpm +Style "xmoondial" Icon hobbes-icons-xpm3/m/moonb.xpm,MiniIcon mini/clock.xpm +Style "xmultibiff" Icon hobbes-icons-xpm3/m/mailbox.xpm,MiniIcon mini/mail.xpm +Style "Work1" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "work1" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm + +Style "XClock" Icon hobbes-icons-xpm3/s/sysclock.xpm,MiniIcon mini/clock.xpm +Style "XPbiff" Icon ctwm/mail0.xpm,MiniIcon mini/mail.xpm +Style "XRlogin" Icon cl-32/rlogin.xpm,MiniIcon mini/terminal.xpm +Style "xvtdl" Icon cl-32/check_list.xpm,MiniIcon mini/information.xpm +Style "Xvtdl" Icon cl-32/check_list.xpm,MiniIcon mini/information.xpm +Style "faces" Icon cl-32/face.xpm +Style "sunclock" Icon hobbes-icons-xpm3/s/sundial.xpm,MiniIcon mini/clock.xpm +Style "timex" Icon hobbes-icons-xpm3/t/timer2.xpm,MiniIcon mini/clock.xpm +Style "window info" Icon norm/information.xpm,MiniIcon mini/information.xpm +Style "*PostScript File" Icon desktop/document/postscript.xpm,MiniIcon mini/ghostview.xpm +Style "*belthil*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*camelot*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*dhaka*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*diamond*" Icon hpterm.xpm,MiniIcon mini/terminal.xpm +Style "*ikenga*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*jade*" Icon hpterm.xpm,MiniIcon mini/terminal.xpm +Style "*mashad*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*onyx*" Icon hpterm.xpm,MiniIcon mini/terminal.xpm +Style "*pearl*" Icon hpterm.xpm,MiniIcon mini/terminal.xpm +Style "*plymouth*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*rome*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*seoul*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*sylhet*" Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm +Style "*topaz*" Icon hpterm.xpm,MiniIcon mini/terminal.xpm +Style "*zircon*" Icon hpterm.xpm,MiniIcon mini/terminal.xpm + + --- fvwm-2.5.27.ds.orig/debian/manoj/menudefs.hook +++ fvwm-2.5.27.ds/debian/manoj/menudefs.hook @@ -0,0 +1,195 @@ +#===================================================== A. menus +# A. menus - defer bindings until later +# Delete +# Fvwm checks to see if the window understands the "Delete" +# protocol. Not all windows do. If it understands "Delete", fvwm sends +# the delete message to the window. If the program operating the window +# is working well, it will remove itself sometime in the relatively +# near future. (May not be immediate, the application may pop-up a +# confirm box, may save its state, whatever). As far as fvwm is +# concerned, the "Delete" action is done when the message is sent, even +# if the window still exists. +# Close +# Similar to delete, but if the window doesn't understand "Delete", the +# window is destroyed. At this point, you have either sent two delete +# messages, or have beeped and destroyed the window. When destroying a +# window, Fvwm actually removes the window, and the program usually, +# but not always, crashes. +# Destroy +# This will make fvwm actually destroy the window. Chances are, this +# will happen before any of the "Delete" messages are handled by the +# application. +# +# The correct thing to put in your menu, is a simple "Close" this will +# correctly remove all windows, except those that understand "Delete" +# and are misbehaving (crashing, poorly written, whatever). To handle +# the case of a misbehaving window, have a separate item "Destroy" +# which you invoke only if the window doesn't respond to "Close" + +# This menu is invoked as a sub-menu - it allows you to quit, +# restart, or switch to another WM. +DestroyMenu Quit-Verify +AddToMenu "Quit-Verify" "Really Quit Fvwm?" Title ++ "&Yes, Really Quit%mini.exit.xpm%" Quit ++ "&Restart fvwm2%mini.calc.xpm%" Restart /usr/bin/X11/fvwm2 ++ "&No, Don't Quit%mini.checkmark.xpm%" Nop + + + +DestroyMenu Bell +AddToMenu Bell "Loud" Exec xset b 100 ++ "Quiet" Exec xset b 30 ++ "Off" Exec xset b 0 + +DestroyMenu Keyclick +AddToMenu Keyclick "Loud" Exec xset c 100 ++ "Quiet" Exec xset c 13 ++ "Off" Exec xset c 0 + +DestroyMenu Paging +AddToMenu "Paging" "Paging Functions" Title ++ "Paging OFF" EdgeScroll 0 0 ++ "Paging ON" EdgeScroll 100 100 ++ "Horizontal Paging Only" EdgeScroll 100 0 ++ "Vertical Paging Only" EdgeScroll 0 100 ++ "Partial Paging" EdgeScroll 50 50 + + +##+ "Neon Pager" Read .new_pager +##+ "Default Pager" Read .old_pager + + +# AddToFunc StartTin "I" Desk 0 0 +# + "I" GotoPage 0 1 +# + "I" Exec xterm -geometry 98x64+0+0 -ls -e /usr/bin/tin & +# This should move to desk 0, then to the second page down on the left, +# then start up an xterm running tin. Seems to work from any initial +# desk. or xterm -geometry +0+`expr $SCREENHEIGHT` + +# Build a menu of all .jpg files in $HOME/lib/public_html/images +#AddToMenu ImageMenu foo title +#+ DynamicPopupAction Function MakeImageMenu + +AddToFunc MakeImageMenu ++ I DestroyMenu recreate ImageMenu ++ I AddToMenu ImageMenu Pictures Title ++ I PipeRead 'for i in $HOME/public_html/images/*.jpg \ + $HOME/public_html/images/*.gif \ + $HOME/public_html/images/*.png; \ + do echo AddToMenu ImageMenu "`basename $i`" Exec display $i; done' + + +DestroyMenu Forms +AddToMenu Forms "&Q. QuitVerify" Module FvwmForm FvwmForm-QuitVerify +AddToMenu Forms "&C. Capture" Module FvwmForm FvwmForm-Capture +AddToMenu Forms "&R. Rlogin" Module FvwmForm FvwmForm-Rlogin +AddToMenu Forms "&T. Talk" Module FvwmForm FvwmForm-Talk +AddToMenu Forms "&F. FORM" Module FvwmForm FvwmForm-Form +AddToMenu Forms "&O. RootCursor" Module FvwmForm FvwmForm-RootCursor + +DestroyFunc RaiseOnTop +AddToFunc RaiseOnTop + + I Layer 0 4 + + I Raise +# cyclicly change a window layer 4 -> 10 -> 5 -> 9 -> 4 + +DestroyFunc ActuallyDoLayer +AddToFunc ActuallyDoLayer +ThisWindow (Layer 4) + Layer 10 +ThisWindow (Layer 5) + Layer 9 +ThisWindow (Layer 9) + Layer 4 +ThisWindow (Layer 10) + Layer 5 +ActuallyDoLayer + +# AddToFunc ChangeRootHourly +# + I Exec exec cgbg +# + I Schedule 3600000 ChangeRootHourly + +DestroyFunc ChangeRootHourly +AddToFunc ChangeRootHourly ++ I PipeRead `dump-2-config-lines-for-colorset-51-and-52` ++ I Schedule 3600000 ChangeRootHourly + +#AddToFunc StartFunction +#+ I ChangeRootHourly +#+ I FvwmBacker + +#*FvwmBacker: Command (Desk 0) Colorset 51 +#*FvwmBacker: Command (Desk 1) Colorset 52 + +#The script should dump 2 lines, something like: +# Colorset 51 Pixmap bg7.png +# Colorset 52 Pixmap bg4.png + + +#AddtoFunc move_noresist +# + I EdgeResistance 10000 100 +# + I Move +# + I EdgeResistance 10000 10000 + +DestroyFunc FuncFvwmMaximizeFullScreen +AddToFunc FuncFvwmMaximizeFullScreen + + I ThisWindow (Maximized) Style $n Title, BorderWidth 4, HandleWidth 4 + + I KeepRc TestRc (NoMatch) Style $n NoTitle, BorderWidth 16, HandleWidth 16 + + I KeepRc TestRc (NoMatch) Raise + + I KeepRc TestRc (NoMatch) UpdateStyles + + I Maximize + + +# +# Some Example Menus +# +# + +DestroyMenu "Remote-Popup" +AddToMenu "Remote-Popup" "somewhere" exec xterm -sl 1024 -cr white -fg white -bg \#114433 -T Oneway -e ssh -l me somewhere.com ++ "generic" FvwmForm Ssh + +DestroyMenu "Graphics-Popup" +AddToMenu "Graphics-Popup" "The GIMP" Exec xterm -fg \#30d030 -bg black -T gimpit -geometry 80x5+602+787 -e /usr/bin/gimp ++ "Tgif" Exec tgif ++ "Xpaint" Exec xpaint ++ "Xmag" Exec xmag ++ "XView" Exec xv ++ "Image Magick" Exec display + +DestroyMenu "Development-Popup" +AddToMenu "Development-Popup" "X-gdb" Exec xxgdb ++ "ddd" Exec ddd ++ "X-man" Exec xman + +DestroyMenu "Accessories-Popup" +AddToMenu "Accessories-Popup" "Calculator" Exec xcalc ++ "Seyon" Exec seyon -modems /dev/cuaa1 ++ "Nedit" Exec nedit ++ "Lock" Exec xlock -mode swarm + +DestroyMenu "Games-Popup" +AddToMenu "Games-Popup" "X-kobo" Exec xkobo ++ "X-boing" Exec xboing ++ "Mahjong" Exec xmj ++ "Minesweeper" Exec xmine ++ "X-Emeraldia" Exec xemeraldia -noscore ++ "Solitaire" Exec tksol + +DestroyMenu "Sound-Popup" +AddToMenu "Sound-Popup" "X-Mixer" Exec xmmix ++ "Xm-CD Player" Exec xmcd + + +DestroyMenu MiscUtilities +AddToMenu MiscUtilities ++ "Paging" Popup Paging ++ "Forms" Popup Forms ++ "Graphics-Popup" Popup "Graphics-Popup" ++ "Development-Popup" Popup "Development-Popup" ++ "Accessories-Popup" Popup "Accessories-Popup" ++ "Games-Popup" Popup "Games-Popup" ++ "Sound-Popup" Popup "Sound-Popup" ++ "Move Mehtods" Popup FvwmMoveMethods ++ DynamicPopupAction Function MakeImageMenu ++ "Images" Popup ImageMenu ++ DynamicPopupAction Function WallpaperBrowser ++ "WallPaper Browser" Popup WallpaperBrowserMenu ++ MissingSubmenuFunction FuncFvwmMenuDirectory ++ "WallPapers" Popup $[fvwm_image_path]/wallpaper/ --- fvwm-2.5.27.ds.orig/debian/manoj/FvwmButtons.hook +++ fvwm-2.5.27.ds/debian/manoj/FvwmButtons.hook @@ -0,0 +1,118 @@ + +#===================================================== E. modules +#_____________________________________________________ E.1 FvwmButtons +# E.1 FvwmButtons +KillModule FvwmButtons + +*FvwmButtonsBoxSize smart +*FvwmButtonsRows 5 + +*FvwmButtonsPadding 1 2 +*FvwmButtonsGeometry -1+1 + +# We could set a geomettry as well: +# *FvwmButtonsGeometry 1280x32+0-0 +# forbid resizing +# *FvwmButtonsBoxSize fixed + +# Define the buttons to use..... + +*FvwmButtons(Container(Rows 5, Frame 3, Padding 1 2)) + +# The leftmost 4 buttons (next,prev,lower,raise) +*FvwmButtons(4x4,Container(Colorset 23, \ + Rows 4,Frame 3, Padding 2 4)) +*FvwmButtons(1x2,Title Next, Icon arrow.xpm Action "Desk 1 0") +*FvwmButtons(1x2,Title Prev, Icon arrowb.xpm Action "Desk -1 0") +*FvwmButtons(1x2,Title Lower, Icon Down, Action Lower) +*FvwmButtons(1x2,Title Raise, Icon Up, Action Raise) +*FvwmButtons(End) + +# Add in the pager .... +*FvwmButtons(8x4,Container(Rows 4,Frame -3, Padding 2 4)) +*FvwmButtons(8x4, Swallow(UseOld) "FvwmPager" `FvwmPager 0 1` Frame -3) +*FvwmButtons(End) + +*FvwmButtons(18x4,Container(Colorset 23,Rows 4, Frame -4, Padding 2 4)) +*FvwmButtons(18x1,Frame -4, Swallow(UseOld,NoKill) "xticktalk" \ + `Exec nice -15 xticktalk -before -approximate -fg $[fg.cs13] -bg $[bg.cs13] \ + -fn '-adobe-times-bold-r-*-*-20-*-*-*-*-*-*-*' -geometry -1500-1500&`) + + +*FvwmButtons(6x3,Container(Colorset 23, \ + Rows 3,Frame 2, Padding 2 4)) +*FvwmButtons(3x3,Title Wth,Swallow(UseOld,NoKill) "wmWeather" \ + `Exec nice -15 wmWeather -s KBNA &`) +*FvwmButtons(3x3,Title Mon,Swallow(UseOld,NoKill) "wmmon" \ + `Exec nice -19 wmmon &`) +*FvwmButtons(End) + +*FvwmButtons(12x3,Container(Colorset 23,Rows 3)) +*FvwmButtons(12x1,Frame -4, Swallow(UseOld,NoKill) "xclock" \ + `Exec nice xclock -digital -padding 0 -bg $[bg.cs13] -update 5 \ + -fn '-adobe-times-bold-r-*-*-20-*-*-*-*-*-*-*' -geometry -1500-1500&`) + + +*FvwmButtons(6x2,Frame -4, Swallow(UseOld,NoKill) "xload" \ + `Exec nice -15 xload -label $HOSTDISPLAY -fg $[fg.cs13] \ + -bg $[bg.cs13] -geometry -1500-1500 -fn '-adobe-courier-*-r-normal--12-120-75-75-m-0-iso8859-1' &`) +*FvwmButtons(2x2,Frame -4, Swallow(UseOld,NoKill) "oclock" \ + `Exec nice oclock -jewel DarkBlue -minute $[fg.cs13] \ + -hour $[fg.cs13] -geometry -1500-1500 -bg $[bg.cs13] &`) + +*FvwmButtons(3x2,Swallow(UseOld,NoKill,Respawn) "wmifs" \ + `Exec nice wmifs -w `) +*FvwmButtons(2x2,Fore $[fg.cs13],Frame 3,Title Root, Icon supermn1.xpm, \ + Action `Exec "Root" exec uxterm -fg $[fg.cs31] -bg $[bg.cs31] \ + -T Root -e /bin/su -c '/bin/bash -rcfile \ + "~srivasta/.rootrc" -i' root&`) + +*FvwmButtons(End) + +*FvwmButtons(End) + +# Now come the bottom row buttons: +*FvwmButtons(30x1,Container(Colorset 23, Rows 1)) +*FvwmButtons(4x1, Title Utils, Action "Popup Utilities") +*FvwmButtons(4x1, Title Window, Action "Popup WinOps" ) +*FvwmButtons(4x1, Title Misc, Action "Function general_ops_func") +*FvwmButtons(18x1,Size 395 20,Swallow(UseOld,NoKill,Respawn) "xbuffy" \ + `Exec xbuffy -geometry 388x20 -bg $[bg.cs12] -fg $[fg.cs12] -fill -center -horiz -boxfile ~/etc/xbuffy -fn '-adobe-courier-*-r-normal--12-120-75-75-m-0-iso8859-1' &`) +*FvwmButtons(End) + + +*FvwmButtons(End) + +##########*FvwmButtons(2x3,Title CPU,Swallow(UseOld,NoKill) "wmMoonClock" \ +########## `Exec nice -19 wmMoonClock -lat 30.45 -lon 88.18 &`) +######## `Exec nice dctrl -iconic -control-window &`) +#####*FvwmButtons(16x1,Size 378 20,Swallow(UseOld,NoKill,Respawn) "xmultibiff" \ +##### `Exec xmultibiff -geometry 370x20 -bg Gray17 -fg CornSilk +##### -mail +##### ~/var/spool/mail/{important,admin,gcif,gcifcases,digital,debian.spool,consult,bcast} +##### &`) +######*FvwmButtons(2x2,Swallow(UseOld,NoKill,Respawn) "dctrlIcon" \ +###### `Exec ~/bin/getdctrl `) + + +########## PANEL +#*FvwmButtonsPanel WinOps +#*FvwmButtonsBack bisque2 +#*FvwmButtonsGeometry -3-3 +#*FvwmButtonsColumns 1 + +#*FvwmButtons(Title Resize ,Icon resize.xpm ,Action Resize) +#*FvwmButtons(Title Move ,Icon arrows2.xpm,Action Move ) +#*FvwmButtons(Title Lower ,Icon Down ,Action Lower ) +#*FvwmButtons(Title Raise ,Icon Up ,Action Raise ) +#*FvwmButtons(Title Iconify,Icon Iconify ,Action Iconify) +#*FvwmButtons(Title Stick ,Icon Stick ,Action Stick ) + +########## PANEL +#*FvwmButtonsPanel Tools +#*FvwmButtonsBack bisque2 +#*FvwmButtonsGeometry -1-1 +#*FvwmButtonsColumns 1 + +#*FvwmButtons(Title Kill ,Icon bomb.xpm ,Action Destroy) +#*FvwmButtons(Title Kill ,Icon bomb.xpm ,Action Destroy) --- fvwm-2.5.27.ds.orig/doc/Makefile.in +++ fvwm-2.5.27.ds/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -16,15 +16,11 @@ # Author: Scott Smedley -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,10 +49,11 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -66,6 +63,8 @@ am__installdirs = "$(DESTDIR)$(docdir)" docDATA_INSTALL = $(INSTALL_DATA) DATA = $(doc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -74,8 +73,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,10 +124,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -154,6 +147,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -170,6 +164,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -217,9 +212,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -231,6 +228,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @FVWM_DOCDIR@ @@ -270,10 +268,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -342,10 +343,9 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ footer.html: $(top_builddir)/config.status $(srcdir)/footer.html.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -uninstall-info-am: install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -392,8 +392,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -437,8 +436,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -463,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -474,13 +473,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -494,22 +492,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -523,7 +520,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -531,6 +528,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -541,7 +540,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -587,12 +586,20 @@ install-data-am: install-docDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -611,22 +618,24 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-info-am +uninstall-am: uninstall-docDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ install-am install-data install-data-am install-docDATA \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-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 installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-docDATA uninstall-info-am + uninstall-docDATA all: $(doc_DATA) --- fvwm-2.5.27.ds.orig/doc/docbook-xsl/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xsl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -49,10 +45,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -61,8 +60,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -114,10 +111,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -141,6 +134,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -157,6 +151,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -204,9 +199,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -218,6 +215,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -257,10 +255,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -319,7 +320,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -352,8 +352,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -397,8 +396,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -423,8 +422,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -434,13 +433,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -454,22 +452,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -483,7 +480,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -491,6 +488,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -544,12 +543,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -568,21 +575,23 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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 \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xsl/common/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xsl/common/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,8 +48,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,10 +99,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -132,6 +122,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +139,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -195,9 +187,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -248,10 +243,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -328,7 +326,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -337,22 +334,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -411,12 +407,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -435,16 +439,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xsl/highlighting/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xsl/highlighting/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,8 +48,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,10 +99,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -132,6 +122,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +139,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -195,9 +187,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -248,10 +243,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -309,7 +307,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -318,22 +315,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -392,12 +388,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -416,16 +420,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xsl/html/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xsl/html/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,8 +48,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,10 +99,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -132,6 +122,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +139,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -195,9 +187,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -248,10 +243,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -349,7 +347,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -358,22 +355,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -432,12 +428,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -456,16 +460,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xsl/profiling/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xsl/profiling/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,8 +48,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,10 +99,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -132,6 +122,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +139,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -195,9 +187,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -248,10 +243,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -310,7 +308,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -319,22 +316,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -393,12 +389,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -417,16 +421,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xsl/manpages/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xsl/manpages/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,8 +48,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,10 +99,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -132,6 +122,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +139,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -195,9 +187,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -248,10 +243,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -323,7 +321,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -332,22 +329,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -406,12 +402,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -430,16 +434,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xsl/lib/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xsl/lib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,8 +48,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,10 +99,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -132,6 +122,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +139,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -195,9 +187,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -248,10 +243,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -309,7 +307,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -318,22 +315,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -392,12 +388,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -416,16 +420,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xml/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xml/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,10 +46,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -62,8 +61,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +112,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +135,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +152,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +200,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +216,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -258,10 +256,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -332,7 +333,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -365,8 +365,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -410,8 +409,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -436,8 +435,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -447,13 +446,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -467,22 +465,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -496,7 +493,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -504,6 +501,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -557,12 +556,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -581,21 +588,23 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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 \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/docbook-xml/ent/Makefile.in +++ fvwm-2.5.27.ds/doc/docbook-xml/ent/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,8 +48,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,10 +99,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -132,6 +122,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +139,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -195,9 +187,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -248,10 +243,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -328,7 +326,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -337,22 +334,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -411,12 +407,20 @@ install-data-am: +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -435,16 +439,19 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/modules/Makefile.in +++ fvwm-2.5.27.ds/doc/modules/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -16,15 +16,11 @@ # Author: Scott Smedley -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,10 +48,11 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -65,6 +62,8 @@ am__installdirs = "$(DESTDIR)$(docdir)" docDATA_INSTALL = $(INSTALL_DATA) DATA = $(doc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -73,8 +72,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -126,10 +123,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -153,6 +146,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,6 +163,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -216,9 +211,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -230,6 +227,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @FVWM_DOCDIR@/modules @@ -269,10 +267,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -343,10 +344,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -393,8 +393,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -438,8 +437,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -464,8 +463,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -475,13 +474,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -495,22 +493,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -524,7 +521,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -532,6 +529,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -542,7 +541,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -587,12 +586,20 @@ install-data-am: install-docDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -611,22 +618,24 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-info-am +uninstall-am: uninstall-docDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-local \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-docDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-docDATA uninstall-info-am +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-local \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-docDATA 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-docDATA clean: --- fvwm-2.5.27.ds.orig/doc/modules/images/Makefile.in +++ fvwm-2.5.27.ds/doc/modules/images/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -49,10 +45,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -61,8 +60,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -114,10 +111,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -141,6 +134,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -157,6 +151,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -204,9 +199,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -218,6 +215,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -257,10 +255,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -316,7 +317,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -349,8 +349,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -394,8 +393,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -420,8 +419,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -431,13 +430,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -451,22 +449,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -480,7 +477,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -488,6 +485,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -541,12 +540,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -565,21 +572,23 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + 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 \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/modules/images/FvwmTabs/Makefile.in +++ fvwm-2.5.27.ds/doc/modules/images/FvwmTabs/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,8 +58,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +109,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +132,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +197,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +213,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @FVWM_DOCDIR@/modules/images/FvwmTabs @@ -258,10 +253,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -321,10 +319,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -347,22 +344,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -378,7 +374,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -424,12 +420,20 @@ install-data-am: install-docDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -448,17 +452,20 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-info-am +uninstall-am: uninstall-docDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-docDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-docDATA 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- fvwm-2.5.27.ds.orig/doc/fvwm/Makefile.in +++ fvwm-2.5.27.ds/doc/fvwm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -16,15 +16,11 @@ # Author: Scott Smedley -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -67,8 +63,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -120,10 +114,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -147,6 +137,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -163,6 +154,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -210,9 +202,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -224,6 +218,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @FVWM_DOCDIR@/fvwm @@ -263,10 +258,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -333,10 +331,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -381,7 +378,7 @@ done install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -404,22 +401,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -435,7 +431,7 @@ all-am: Makefile $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -479,12 +475,20 @@ install-data-am: install-data-local install-docDATA install-man +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -503,20 +507,23 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-info-am uninstall-man +uninstall-am: uninstall-docDATA uninstall-man uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distclean-local distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local install-docDATA \ - install-exec install-exec-am install-info install-info-am \ - install-man install-man1 install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA \ - uninstall-info-am uninstall-man uninstall-man1 + install-data-am install-data-local install-docDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-docDATA uninstall-man uninstall-man1 all: $(BUILD_HTML_FILES) $(BUILD_MANS) --- fvwm-2.5.27.ds.orig/doc/commands/Makefile.in +++ fvwm-2.5.27.ds/doc/commands/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,8 +58,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -115,10 +109,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -142,6 +132,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,6 +149,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -205,9 +197,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -219,6 +213,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @FVWM_DOCDIR@/commands @@ -258,10 +253,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -320,10 +318,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -346,22 +343,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -377,7 +373,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -421,12 +417,20 @@ install-data-am: install-docDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -445,17 +449,20 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-info-am +uninstall-am: uninstall-docDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distclean-local distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-docDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data-am install-docDATA 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA @FVWM_BUILD_HTMLDOC_TRUE@all: @DOC_COMMANDS_HTML@ WindowsDesk.html --- fvwm-2.5.27.ds.orig/doc/images/Makefile.in +++ fvwm-2.5.27.ds/doc/images/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -16,15 +16,11 @@ # Author: Scott Smedley -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,10 +48,11 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -65,6 +62,8 @@ am__installdirs = "$(DESTDIR)$(docdir)" docDATA_INSTALL = $(INSTALL_DATA) DATA = $(doc_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -73,8 +72,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -126,10 +123,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -153,6 +146,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,6 +163,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -216,9 +211,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -230,6 +227,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @FVWM_DOCDIR@/images @@ -269,10 +267,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -330,10 +331,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -380,8 +380,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -425,8 +424,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -451,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -462,13 +461,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -482,22 +480,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -511,7 +508,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -519,6 +516,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -529,7 +528,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -575,12 +574,20 @@ install-data-am: install-docDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -599,22 +606,24 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-info-am +uninstall-am: uninstall-docDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ install-am install-data install-data-am install-docDATA \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-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 installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-docDATA uninstall-info-am + uninstall-docDATA all: $(doc_DATA) --- fvwm-2.5.27.ds.orig/doc/images/svg_rendering/Makefile.in +++ fvwm-2.5.27.ds/doc/images/svg_rendering/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -16,15 +16,11 @@ # Author: Scott Smedley -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -64,8 +60,6 @@ ALLOCA = @ALLOCA@ ALL_DOMAINS = @ALL_DOMAINS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -117,10 +111,6 @@ FVWMTASKBAR_DOMAIN = @FVWMTASKBAR_DOMAIN@ FVWMWORKERSLIST = @FVWMWORKERSLIST@ FVWMWORKERSLISTLONG = @FVWMWORKERSLISTLONG@ -FVWM_BUILD_HTMLDOC_FALSE = @FVWM_BUILD_HTMLDOC_FALSE@ -FVWM_BUILD_HTMLDOC_TRUE = @FVWM_BUILD_HTMLDOC_TRUE@ -FVWM_BUILD_MANDOC_FALSE = @FVWM_BUILD_MANDOC_FALSE@ -FVWM_BUILD_MANDOC_TRUE = @FVWM_BUILD_MANDOC_TRUE@ FVWM_CONFDIR = @FVWM_CONFDIR@ FVWM_CPP = @FVWM_CPP@ FVWM_DATADIR = @FVWM_DATADIR@ @@ -144,6 +134,7 @@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ IMLIBCONF = @IMLIBCONF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -160,6 +151,7 @@ MAKEINFO = @MAKEINFO@ MANFVWMGTK = @MANFVWMGTK@ MANPAGE_PREAMBLE = @MANPAGE_PREAMBLE@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -207,9 +199,11 @@ Xinerama_LIBS = @Xinerama_LIBS@ Xrender_CFLAGS = @Xrender_CFLAGS@ Xrender_LIBS = @Xrender_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -221,6 +215,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @FVWM_DOCDIR@/images/svg_rendering @@ -260,10 +255,13 @@ rsvg_LIBS = @rsvg_LIBS@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ stroke_CFLAGS = @stroke_CFLAGS@ stroke_LIBS = @stroke_LIBS@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ with_bidi = @with_bidi@ with_gdkimlib = @with_gdkimlib@ with_gettext = @with_gettext@ @@ -326,10 +324,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -352,22 +349,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -383,7 +379,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -429,12 +425,20 @@ install-data-am: install-docDATA +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -453,17 +457,20 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-info-am +uninstall-am: uninstall-docDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-docDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-docDATA 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-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA all: $(doc_DATA)