diff --git a/Makefile.in b/Makefile.in
index 577294926016e4d1da51cd0c7205e4e81f7be97c..f45ef782f09c235da2ba0ad624a9dcd0ed72543d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -209,7 +209,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/debug.m4 m4/depends.m4 m4/i18n.m4 m4/X11.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -321,15 +321,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -473,7 +467,7 @@ distcheck: dist
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
+ cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -482,11 +476,11 @@ distuninstallcheck:
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
+ if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
diff --git a/aclocal.m4 b/aclocal.m4
index 8746e4c24a62c5b66ce499c465a717591a283b54..a48e65020bfffc6d89d5b4cd44b90b090e2735b4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@@ -16,7 +16,7 @@
# 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.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,14 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 10
+# 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,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
AC_PREREQ([2.54])
@@ -163,7 +170,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.4])])
+ [AM_AUTOMAKE_VERSION([1.7.3])])
# Helper functions for option handling. -*- Autoconf -*-
diff --git a/config.guess b/config.guess
index cc726cd15a9332c9e3cfee26d6ab972b1d8df055..4fc21ecc3aa7606ce71a99fdd93754826e14b11c 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-02-22'
+timestamp='2003-01-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -235,6 +235,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:MicroBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
diff --git a/config.sub b/config.sub
index 9772e87d2418f538a68dc3675a31c784a0356082..5f94062aafd8a9cc46f1322e63263ba3aa9594c4 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-02-22'
+timestamp='2003-02-03'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -1128,7 +1128,7 @@ case $os in
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix*)
+ | -powermax* | -dnix* | -microbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff --git a/configure b/configure
index e43bc31fe35f62955644f2e8fd4772846c52cd5f..53e4a0fc6d17b56326b37ed5aac57f3d384e4f81 100755
--- a/configure
+++ b/configure
@@ -8368,23 +8368,23 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libxfcegui4-1.0 >= 0.0.16" >&5
-echo $ECHO_N "checking for libxfcegui4-1.0 >= 0.0.16... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for libxfcegui4-1.0 >= 0.0.23" >&5
+echo $ECHO_N "checking for libxfcegui4-1.0 >= 0.0.23... $ECHO_C" >&6
- if $PKG_CONFIG --exists "libxfcegui4-1.0 >= 0.0.16" ; then
+ if $PKG_CONFIG --exists "libxfcegui4-1.0 >= 0.0.23" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking LIBXFCEGUI4_CFLAGS" >&5
echo $ECHO_N "checking LIBXFCEGUI4_CFLAGS... $ECHO_C" >&6
- LIBXFCEGUI4_CFLAGS=`$PKG_CONFIG --cflags "libxfcegui4-1.0 >= 0.0.16"`
+ LIBXFCEGUI4_CFLAGS=`$PKG_CONFIG --cflags "libxfcegui4-1.0 >= 0.0.23"`
echo "$as_me:$LINENO: result: $LIBXFCEGUI4_CFLAGS" >&5
echo "${ECHO_T}$LIBXFCEGUI4_CFLAGS" >&6
echo "$as_me:$LINENO: checking LIBXFCEGUI4_LIBS" >&5
echo $ECHO_N "checking LIBXFCEGUI4_LIBS... $ECHO_C" >&6
- LIBXFCEGUI4_LIBS=`$PKG_CONFIG --libs "libxfcegui4-1.0 >= 0.0.16"`
+ LIBXFCEGUI4_LIBS=`$PKG_CONFIG --libs "libxfcegui4-1.0 >= 0.0.23"`
echo "$as_me:$LINENO: result: $LIBXFCEGUI4_LIBS" >&5
echo "${ECHO_T}$LIBXFCEGUI4_LIBS" >&6
else
@@ -8392,7 +8392,7 @@ echo "${ECHO_T}$LIBXFCEGUI4_LIBS" >&6
LIBXFCEGUI4_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- LIBXFCEGUI4_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxfcegui4-1.0 >= 0.0.16"`
+ LIBXFCEGUI4_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxfcegui4-1.0 >= 0.0.23"`
echo $LIBXFCEGUI4_PKG_ERRORS
fi
@@ -8407,12 +8407,12 @@ echo "${ECHO_T}$LIBXFCEGUI4_LIBS" >&6
if test $succeeded = yes; then
:
else
- { { echo "$as_me:$LINENO: error: Library requirements (libxfcegui4-1.0 >= 0.0.16) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (libxfcegui4-1.0 >= 0.0.16) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { { echo "$as_me:$LINENO: error: Library requirements (libxfcegui4-1.0 >= 0.0.23) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libxfcegui4-1.0 >= 0.0.23) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
fi
- LIBXFCEGUI4_REQUIRED_VERSION=0.0.16
+ LIBXFCEGUI4_REQUIRED_VERSION=0.0.23
diff --git a/configure.ac b/configure.ac
index 505094c783c979b55b045b01f0a76bce201cd3fe..8a5963cd250e9b881092175415e5cb8a1aa5aa62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ BM_LIBXPM_REQUIRE
BM_DEPEND(LIBXFCE4MCS_CLIENT, libxfce4mcs-client-1.0, 0.0.3)
BM_DEPEND(LIBXFCE4MCS_MANAGER, libxfce4mcs-manager-1.0, 0.0.3)
-BM_DEPEND(LIBXFCEGUI4, libxfcegui4-1.0, 0.0.16)
+BM_DEPEND(LIBXFCEGUI4, libxfcegui4-1.0, 0.0.23)
XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [0.2.0])
BM_DEPEND_CHECK(LIBSTARTUP_NOTIFICATION, libstartup-notification-1.0, 0.4,
diff --git a/defaults/Makefile.in b/defaults/Makefile.in
index 9f8534010b1a077b10fb0e35816dd9752574bdb4..75b219e69c2b5fe4c3f8959c3726e0f3d45605a3 100644
--- a/defaults/Makefile.in
+++ b/defaults/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -167,7 +167,6 @@ defaultsdir = $(pkgdatadir)
defaults_DATA = defaults
EXTRA_DIST = defaults.in
subdir = defaults
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in
index 52f9fe2b7b27d9f3eb9239c5460784b7e2d7a36c..666ba4ab4364f78867525a7ae1876ef31bf52bbb 100644
--- a/doc/C/Makefile.in
+++ b/doc/C/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -179,7 +179,6 @@ doc_DATA = \
EXTRA_DIST = $(noinst_DATA) $(doc_DATA)
subdir = doc/C
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -311,15 +310,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index bc6bdb20264f4a743f0e134dc6d9494820fb7822..9d81a37d1081cc5786af532161b039b70bd8f10f 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -167,7 +167,6 @@ EXTRA_DIST = $(images_DATA)
imagesdir = $(pkgdatadir)/doc/C/images
images_DATA =
subdir = doc/C/images
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b323c96f3529d22ff20f95e12a2155ab0a55c7b9..314cbbf25c56b97587667e93cd565575779fdd8c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -173,7 +173,6 @@ noinst_DATA = \
EXTRA_DIST = $(noinst_DATA)
subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -287,15 +286,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
diff --git a/mcs-plugin/Makefile.in b/mcs-plugin/Makefile.in
index d7491a426e0dc558c6d7c34063e9da2d24c3e09c..8988e2fee5018702da4717f7202876548d2fdc70 100644
--- a/mcs-plugin/Makefile.in
+++ b/mcs-plugin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -245,7 +245,6 @@ noinst_DATA = \
monitor-icon.png
subdir = mcs-plugin
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -361,7 +360,7 @@ distclean-depend:
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -372,7 +371,7 @@ distclean-depend:
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -383,7 +382,7 @@ distclean-depend:
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -394,7 +393,7 @@ distclean-depend:
margins_plugin_la-margins_plugin.o: margins_plugin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(margins_plugin_la_CFLAGS) $(CFLAGS) -MT margins_plugin_la-margins_plugin.o -MD -MP -MF "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" \
@am__fastdepCC_TRUE@ -c -o margins_plugin_la-margins_plugin.o `test -f 'margins_plugin.c' || echo '$(srcdir)/'`margins_plugin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='margins_plugin.c' object='margins_plugin_la-margins_plugin.o' libtool=no @AMDEPBACKSLASH@
@@ -405,7 +404,7 @@ margins_plugin_la-margins_plugin.o: margins_plugin.c
margins_plugin_la-margins_plugin.obj: margins_plugin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(margins_plugin_la_CFLAGS) $(CFLAGS) -MT margins_plugin_la-margins_plugin.obj -MD -MP -MF "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" \
@am__fastdepCC_TRUE@ -c -o margins_plugin_la-margins_plugin.obj `if test -f 'margins_plugin.c'; then $(CYGPATH_W) 'margins_plugin.c'; else $(CYGPATH_W) '$(srcdir)/margins_plugin.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='margins_plugin.c' object='margins_plugin_la-margins_plugin.obj' libtool=no @AMDEPBACKSLASH@
@@ -416,7 +415,7 @@ margins_plugin_la-margins_plugin.obj: margins_plugin.c
margins_plugin_la-margins_plugin.lo: margins_plugin.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(margins_plugin_la_CFLAGS) $(CFLAGS) -MT margins_plugin_la-margins_plugin.lo -MD -MP -MF "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" \
@am__fastdepCC_TRUE@ -c -o margins_plugin_la-margins_plugin.lo `test -f 'margins_plugin.c' || echo '$(srcdir)/'`margins_plugin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='margins_plugin.c' object='margins_plugin_la-margins_plugin.lo' libtool=yes @AMDEPBACKSLASH@
@@ -427,7 +426,7 @@ margins_plugin_la-margins_plugin.lo: margins_plugin.c
xfwm4_plugin_la-xfwm4_plugin.o: xfwm4_plugin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_plugin_la_CFLAGS) $(CFLAGS) -MT xfwm4_plugin_la-xfwm4_plugin.o -MD -MP -MF "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4_plugin_la-xfwm4_plugin.o `test -f 'xfwm4_plugin.c' || echo '$(srcdir)/'`xfwm4_plugin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfwm4_plugin.c' object='xfwm4_plugin_la-xfwm4_plugin.o' libtool=no @AMDEPBACKSLASH@
@@ -438,7 +437,7 @@ xfwm4_plugin_la-xfwm4_plugin.o: xfwm4_plugin.c
xfwm4_plugin_la-xfwm4_plugin.obj: xfwm4_plugin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_plugin_la_CFLAGS) $(CFLAGS) -MT xfwm4_plugin_la-xfwm4_plugin.obj -MD -MP -MF "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4_plugin_la-xfwm4_plugin.obj `if test -f 'xfwm4_plugin.c'; then $(CYGPATH_W) 'xfwm4_plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfwm4_plugin.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfwm4_plugin.c' object='xfwm4_plugin_la-xfwm4_plugin.obj' libtool=no @AMDEPBACKSLASH@
@@ -449,7 +448,7 @@ xfwm4_plugin_la-xfwm4_plugin.obj: xfwm4_plugin.c
xfwm4_plugin_la-xfwm4_plugin.lo: xfwm4_plugin.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_plugin_la_CFLAGS) $(CFLAGS) -MT xfwm4_plugin_la-xfwm4_plugin.lo -MD -MP -MF "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4_plugin_la-xfwm4_plugin.lo `test -f 'xfwm4_plugin.c' || echo '$(srcdir)/'`xfwm4_plugin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfwm4_plugin.c' object='xfwm4_plugin_la-xfwm4_plugin.lo' libtool=yes @AMDEPBACKSLASH@
diff --git a/src/Makefile.in b/src/Makefile.in
index edaf0362c51615d9279ac253184d393b2b262b39..d62bba66471b64d38da1ed1d2c6388ad5e3310ca 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -227,7 +227,6 @@ EXTRA_DIST = inline-tabwin-icon.h tabwin-icon.png
noinst_DATA = inline-tabwin-icon.h tabwin-icon.png
subdir = src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -350,7 +349,7 @@ distclean-depend:
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -361,7 +360,7 @@ distclean-depend:
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -372,7 +371,7 @@ distclean-depend:
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -383,7 +382,7 @@ distclean-depend:
xfwm4-client.o: client.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.o -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='client.c' object='xfwm4-client.o' libtool=no @AMDEPBACKSLASH@
@@ -394,7 +393,7 @@ xfwm4-client.o: client.c
xfwm4-client.obj: client.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.obj -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='client.c' object='xfwm4-client.obj' libtool=no @AMDEPBACKSLASH@
@@ -405,7 +404,7 @@ xfwm4-client.obj: client.c
xfwm4-client.lo: client.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.lo -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-client.lo `test -f 'client.c' || echo '$(srcdir)/'`client.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='client.c' object='xfwm4-client.lo' libtool=yes @AMDEPBACKSLASH@
@@ -416,7 +415,7 @@ xfwm4-client.lo: client.c
xfwm4-events.o: events.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.o -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='events.c' object='xfwm4-events.o' libtool=no @AMDEPBACKSLASH@
@@ -427,7 +426,7 @@ xfwm4-events.o: events.c
xfwm4-events.obj: events.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.obj -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='events.c' object='xfwm4-events.obj' libtool=no @AMDEPBACKSLASH@
@@ -438,7 +437,7 @@ xfwm4-events.obj: events.c
xfwm4-events.lo: events.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.lo -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-events.lo `test -f 'events.c' || echo '$(srcdir)/'`events.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='events.c' object='xfwm4-events.lo' libtool=yes @AMDEPBACKSLASH@
@@ -449,7 +448,7 @@ xfwm4-events.lo: events.c
xfwm4-frame.o: frame.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.o -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-frame.o `test -f 'frame.c' || echo '$(srcdir)/'`frame.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='frame.c' object='xfwm4-frame.o' libtool=no @AMDEPBACKSLASH@
@@ -460,7 +459,7 @@ xfwm4-frame.o: frame.c
xfwm4-frame.obj: frame.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.obj -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-frame.obj `if test -f 'frame.c'; then $(CYGPATH_W) 'frame.c'; else $(CYGPATH_W) '$(srcdir)/frame.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='frame.c' object='xfwm4-frame.obj' libtool=no @AMDEPBACKSLASH@
@@ -471,7 +470,7 @@ xfwm4-frame.obj: frame.c
xfwm4-frame.lo: frame.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.lo -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-frame.lo `test -f 'frame.c' || echo '$(srcdir)/'`frame.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='frame.c' object='xfwm4-frame.lo' libtool=yes @AMDEPBACKSLASH@
@@ -482,7 +481,7 @@ xfwm4-frame.lo: frame.c
xfwm4-hints.o: hints.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.o -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-hints.o `test -f 'hints.c' || echo '$(srcdir)/'`hints.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hints.c' object='xfwm4-hints.o' libtool=no @AMDEPBACKSLASH@
@@ -493,7 +492,7 @@ xfwm4-hints.o: hints.c
xfwm4-hints.obj: hints.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.obj -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-hints.obj `if test -f 'hints.c'; then $(CYGPATH_W) 'hints.c'; else $(CYGPATH_W) '$(srcdir)/hints.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hints.c' object='xfwm4-hints.obj' libtool=no @AMDEPBACKSLASH@
@@ -504,7 +503,7 @@ xfwm4-hints.obj: hints.c
xfwm4-hints.lo: hints.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.lo -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-hints.lo `test -f 'hints.c' || echo '$(srcdir)/'`hints.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hints.c' object='xfwm4-hints.lo' libtool=yes @AMDEPBACKSLASH@
@@ -515,7 +514,7 @@ xfwm4-hints.lo: hints.c
xfwm4-keyboard.o: keyboard.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.o -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-keyboard.o `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyboard.c' object='xfwm4-keyboard.o' libtool=no @AMDEPBACKSLASH@
@@ -526,7 +525,7 @@ xfwm4-keyboard.o: keyboard.c
xfwm4-keyboard.obj: keyboard.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.obj -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-keyboard.obj `if test -f 'keyboard.c'; then $(CYGPATH_W) 'keyboard.c'; else $(CYGPATH_W) '$(srcdir)/keyboard.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyboard.c' object='xfwm4-keyboard.obj' libtool=no @AMDEPBACKSLASH@
@@ -537,7 +536,7 @@ xfwm4-keyboard.obj: keyboard.c
xfwm4-keyboard.lo: keyboard.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.lo -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-keyboard.lo `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keyboard.c' object='xfwm4-keyboard.lo' libtool=yes @AMDEPBACKSLASH@
@@ -548,7 +547,7 @@ xfwm4-keyboard.lo: keyboard.c
xfwm4-main.o: main.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.o -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfwm4-main.o' libtool=no @AMDEPBACKSLASH@
@@ -559,7 +558,7 @@ xfwm4-main.o: main.c
xfwm4-main.obj: main.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.obj -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfwm4-main.obj' libtool=no @AMDEPBACKSLASH@
@@ -570,7 +569,7 @@ xfwm4-main.obj: main.c
xfwm4-main.lo: main.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.lo -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xfwm4-main.lo' libtool=yes @AMDEPBACKSLASH@
@@ -581,7 +580,7 @@ xfwm4-main.lo: main.c
xfwm4-menu.o: menu.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.o -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-menu.o `test -f 'menu.c' || echo '$(srcdir)/'`menu.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='menu.c' object='xfwm4-menu.o' libtool=no @AMDEPBACKSLASH@
@@ -592,7 +591,7 @@ xfwm4-menu.o: menu.c
xfwm4-menu.obj: menu.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.obj -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-menu.obj `if test -f 'menu.c'; then $(CYGPATH_W) 'menu.c'; else $(CYGPATH_W) '$(srcdir)/menu.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='menu.c' object='xfwm4-menu.obj' libtool=no @AMDEPBACKSLASH@
@@ -603,7 +602,7 @@ xfwm4-menu.obj: menu.c
xfwm4-menu.lo: menu.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.lo -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-menu.lo `test -f 'menu.c' || echo '$(srcdir)/'`menu.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='menu.c' object='xfwm4-menu.lo' libtool=yes @AMDEPBACKSLASH@
@@ -614,7 +613,7 @@ xfwm4-menu.lo: menu.c
xfwm4-misc.o: misc.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.o -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc.c' object='xfwm4-misc.o' libtool=no @AMDEPBACKSLASH@
@@ -625,7 +624,7 @@ xfwm4-misc.o: misc.c
xfwm4-misc.obj: misc.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.obj -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc.c' object='xfwm4-misc.obj' libtool=no @AMDEPBACKSLASH@
@@ -636,7 +635,7 @@ xfwm4-misc.obj: misc.c
xfwm4-misc.lo: misc.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.lo -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc.c' object='xfwm4-misc.lo' libtool=yes @AMDEPBACKSLASH@
@@ -647,7 +646,7 @@ xfwm4-misc.lo: misc.c
xfwm4-mypixmap.o: mypixmap.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.o -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-mypixmap.o `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mypixmap.c' object='xfwm4-mypixmap.o' libtool=no @AMDEPBACKSLASH@
@@ -658,7 +657,7 @@ xfwm4-mypixmap.o: mypixmap.c
xfwm4-mypixmap.obj: mypixmap.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.obj -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-mypixmap.obj `if test -f 'mypixmap.c'; then $(CYGPATH_W) 'mypixmap.c'; else $(CYGPATH_W) '$(srcdir)/mypixmap.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mypixmap.c' object='xfwm4-mypixmap.obj' libtool=no @AMDEPBACKSLASH@
@@ -669,7 +668,7 @@ xfwm4-mypixmap.obj: mypixmap.c
xfwm4-mypixmap.lo: mypixmap.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.lo -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-mypixmap.lo `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mypixmap.c' object='xfwm4-mypixmap.lo' libtool=yes @AMDEPBACKSLASH@
@@ -680,7 +679,7 @@ xfwm4-mypixmap.lo: mypixmap.c
xfwm4-mywindow.o: mywindow.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mywindow.o -MD -MP -MF "$(DEPDIR)/xfwm4-mywindow.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-mywindow.o `test -f 'mywindow.c' || echo '$(srcdir)/'`mywindow.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-mywindow.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mywindow.c' object='xfwm4-mywindow.o' libtool=no @AMDEPBACKSLASH@
@@ -691,7 +690,7 @@ xfwm4-mywindow.o: mywindow.c
xfwm4-mywindow.obj: mywindow.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mywindow.obj -MD -MP -MF "$(DEPDIR)/xfwm4-mywindow.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-mywindow.obj `if test -f 'mywindow.c'; then $(CYGPATH_W) 'mywindow.c'; else $(CYGPATH_W) '$(srcdir)/mywindow.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-mywindow.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mywindow.c' object='xfwm4-mywindow.obj' libtool=no @AMDEPBACKSLASH@
@@ -702,7 +701,7 @@ xfwm4-mywindow.obj: mywindow.c
xfwm4-mywindow.lo: mywindow.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mywindow.lo -MD -MP -MF "$(DEPDIR)/xfwm4-mywindow.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-mywindow.lo `test -f 'mywindow.c' || echo '$(srcdir)/'`mywindow.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-mywindow.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mywindow.c' object='xfwm4-mywindow.lo' libtool=yes @AMDEPBACKSLASH@
@@ -713,7 +712,7 @@ xfwm4-mywindow.lo: mywindow.c
xfwm4-parserc.o: parserc.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.o -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-parserc.o `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parserc.c' object='xfwm4-parserc.o' libtool=no @AMDEPBACKSLASH@
@@ -724,7 +723,7 @@ xfwm4-parserc.o: parserc.c
xfwm4-parserc.obj: parserc.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.obj -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-parserc.obj `if test -f 'parserc.c'; then $(CYGPATH_W) 'parserc.c'; else $(CYGPATH_W) '$(srcdir)/parserc.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parserc.c' object='xfwm4-parserc.obj' libtool=no @AMDEPBACKSLASH@
@@ -735,7 +734,7 @@ xfwm4-parserc.obj: parserc.c
xfwm4-parserc.lo: parserc.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.lo -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-parserc.lo `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parserc.c' object='xfwm4-parserc.lo' libtool=yes @AMDEPBACKSLASH@
@@ -746,7 +745,7 @@ xfwm4-parserc.lo: parserc.c
xfwm4-session.o: session.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-session.o -MD -MP -MF "$(DEPDIR)/xfwm4-session.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-session.o `test -f 'session.c' || echo '$(srcdir)/'`session.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-session.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='session.c' object='xfwm4-session.o' libtool=no @AMDEPBACKSLASH@
@@ -757,7 +756,7 @@ xfwm4-session.o: session.c
xfwm4-session.obj: session.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-session.obj -MD -MP -MF "$(DEPDIR)/xfwm4-session.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-session.obj `if test -f 'session.c'; then $(CYGPATH_W) 'session.c'; else $(CYGPATH_W) '$(srcdir)/session.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-session.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='session.c' object='xfwm4-session.obj' libtool=no @AMDEPBACKSLASH@
@@ -768,7 +767,7 @@ xfwm4-session.obj: session.c
xfwm4-session.lo: session.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-session.lo -MD -MP -MF "$(DEPDIR)/xfwm4-session.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-session.lo `test -f 'session.c' || echo '$(srcdir)/'`session.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-session.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='session.c' object='xfwm4-session.lo' libtool=yes @AMDEPBACKSLASH@
@@ -779,7 +778,7 @@ xfwm4-session.lo: session.c
xfwm4-settings.o: settings.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.o -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfwm4-settings.o' libtool=no @AMDEPBACKSLASH@
@@ -790,7 +789,7 @@ xfwm4-settings.o: settings.c
xfwm4-settings.obj: settings.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.obj -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfwm4-settings.obj' libtool=no @AMDEPBACKSLASH@
@@ -801,7 +800,7 @@ xfwm4-settings.obj: settings.c
xfwm4-settings.lo: settings.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.lo -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-settings.lo `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='settings.c' object='xfwm4-settings.lo' libtool=yes @AMDEPBACKSLASH@
@@ -812,7 +811,7 @@ xfwm4-settings.lo: settings.c
xfwm4-startup_notification.o: startup_notification.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-startup_notification.o -MD -MP -MF "$(DEPDIR)/xfwm4-startup_notification.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-startup_notification.o `test -f 'startup_notification.c' || echo '$(srcdir)/'`startup_notification.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-startup_notification.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='startup_notification.c' object='xfwm4-startup_notification.o' libtool=no @AMDEPBACKSLASH@
@@ -823,7 +822,7 @@ xfwm4-startup_notification.o: startup_notification.c
xfwm4-startup_notification.obj: startup_notification.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-startup_notification.obj -MD -MP -MF "$(DEPDIR)/xfwm4-startup_notification.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-startup_notification.obj `if test -f 'startup_notification.c'; then $(CYGPATH_W) 'startup_notification.c'; else $(CYGPATH_W) '$(srcdir)/startup_notification.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-startup_notification.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='startup_notification.c' object='xfwm4-startup_notification.obj' libtool=no @AMDEPBACKSLASH@
@@ -834,7 +833,7 @@ xfwm4-startup_notification.obj: startup_notification.c
xfwm4-startup_notification.lo: startup_notification.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-startup_notification.lo -MD -MP -MF "$(DEPDIR)/xfwm4-startup_notification.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-startup_notification.lo `test -f 'startup_notification.c' || echo '$(srcdir)/'`startup_notification.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-startup_notification.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='startup_notification.c' object='xfwm4-startup_notification.lo' libtool=yes @AMDEPBACKSLASH@
@@ -845,7 +844,7 @@ xfwm4-startup_notification.lo: startup_notification.c
xfwm4-spinning_cursor.o: spinning_cursor.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-spinning_cursor.o -MD -MP -MF "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-spinning_cursor.o `test -f 'spinning_cursor.c' || echo '$(srcdir)/'`spinning_cursor.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='spinning_cursor.c' object='xfwm4-spinning_cursor.o' libtool=no @AMDEPBACKSLASH@
@@ -856,7 +855,7 @@ xfwm4-spinning_cursor.o: spinning_cursor.c
xfwm4-spinning_cursor.obj: spinning_cursor.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-spinning_cursor.obj -MD -MP -MF "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-spinning_cursor.obj `if test -f 'spinning_cursor.c'; then $(CYGPATH_W) 'spinning_cursor.c'; else $(CYGPATH_W) '$(srcdir)/spinning_cursor.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='spinning_cursor.c' object='xfwm4-spinning_cursor.obj' libtool=no @AMDEPBACKSLASH@
@@ -867,7 +866,7 @@ xfwm4-spinning_cursor.obj: spinning_cursor.c
xfwm4-spinning_cursor.lo: spinning_cursor.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-spinning_cursor.lo -MD -MP -MF "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-spinning_cursor.lo `test -f 'spinning_cursor.c' || echo '$(srcdir)/'`spinning_cursor.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='spinning_cursor.c' object='xfwm4-spinning_cursor.lo' libtool=yes @AMDEPBACKSLASH@
@@ -878,7 +877,7 @@ xfwm4-spinning_cursor.lo: spinning_cursor.c
xfwm4-tabwin.o: tabwin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-tabwin.o -MD -MP -MF "$(DEPDIR)/xfwm4-tabwin.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-tabwin.o `test -f 'tabwin.c' || echo '$(srcdir)/'`tabwin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-tabwin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tabwin.c' object='xfwm4-tabwin.o' libtool=no @AMDEPBACKSLASH@
@@ -889,7 +888,7 @@ xfwm4-tabwin.o: tabwin.c
xfwm4-tabwin.obj: tabwin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-tabwin.obj -MD -MP -MF "$(DEPDIR)/xfwm4-tabwin.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-tabwin.obj `if test -f 'tabwin.c'; then $(CYGPATH_W) 'tabwin.c'; else $(CYGPATH_W) '$(srcdir)/tabwin.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-tabwin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tabwin.c' object='xfwm4-tabwin.obj' libtool=no @AMDEPBACKSLASH@
@@ -900,7 +899,7 @@ xfwm4-tabwin.obj: tabwin.c
xfwm4-tabwin.lo: tabwin.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-tabwin.lo -MD -MP -MF "$(DEPDIR)/xfwm4-tabwin.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-tabwin.lo `test -f 'tabwin.c' || echo '$(srcdir)/'`tabwin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-tabwin.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tabwin.c' object='xfwm4-tabwin.lo' libtool=yes @AMDEPBACKSLASH@
@@ -911,7 +910,7 @@ xfwm4-tabwin.lo: tabwin.c
xfwm4-workspaces.o: workspaces.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.o -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-workspaces.o `test -f 'workspaces.c' || echo '$(srcdir)/'`workspaces.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspaces.c' object='xfwm4-workspaces.o' libtool=no @AMDEPBACKSLASH@
@@ -922,7 +921,7 @@ xfwm4-workspaces.o: workspaces.c
xfwm4-workspaces.obj: workspaces.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.obj -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-workspaces.obj `if test -f 'workspaces.c'; then $(CYGPATH_W) 'workspaces.c'; else $(CYGPATH_W) '$(srcdir)/workspaces.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspaces.c' object='xfwm4-workspaces.obj' libtool=no @AMDEPBACKSLASH@
@@ -933,7 +932,7 @@ xfwm4-workspaces.obj: workspaces.c
xfwm4-workspaces.lo: workspaces.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.lo -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
@am__fastdepCC_TRUE@ -c -o xfwm4-workspaces.lo `test -f 'workspaces.c' || echo '$(srcdir)/'`workspaces.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Plo"; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspaces.c' object='xfwm4-workspaces.lo' libtool=yes @AMDEPBACKSLASH@
diff --git a/src/client.c b/src/client.c
index f385fe4a446671ceb20d85f878e492fe7edafdf6..2a25018ead28f6e7e3c1167fee379728688abc94 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1816,7 +1816,7 @@ static inline void clientKeepVisible(Client * c)
bottom = (isBottomMostHead(dpy, screen, cx, cy) ? (int)client_margins[MARGIN_BOTTOM] : 0);
/* Translate coodinates to center on physical screen */
- if((use_xinerama) && (abs(c->x - ((XDisplayWidth(dpy, screen) - c->width) / 2)) < 20) && (abs(c->y - ((XDisplayHeight(dpy, screen) - c->height) / 2)) < 20))
+ if((use_xinerama) && (abs(c->x - ((MyDisplayFullWidth(dpy, screen) - c->width) / 2)) < 20) && (abs(c->y - ((MyDisplayFullHeight(dpy, screen) - c->height) / 2)) < 20))
{
/* We consider that the windows is centered on screen,
* Thus, will move it so its center on the current
@@ -3915,7 +3915,7 @@ static GtkToXEventFilterStatus clientMove_event_filter(XEvent * xevent, gpointer
msx = xevent->xmotion.x_root;
msy = xevent->xmotion.y_root;
- max = XDisplayWidth(dpy, screen) - 1;
+ max = MyDisplayFullWidth(dpy, screen) - 1;
if ((msx == 0) || (msx == max))
{
diff --git a/src/events.c b/src/events.c
index b870d8963457141384df3fcafa14e7dd8cb351e9..8eec1af03cfcc3f42a2c8f65296705eb0e7c4ec5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -201,7 +201,7 @@ static inline void handleMotionNotify(XMotionEvent * ev)
{
msx = ev->x_root;
msy = ev->y_root;
- max = XDisplayWidth(dpy, screen) - 1;
+ max = MyDisplayFullWidth(dpy, screen) - 1;
if ((msx == 0) || (msx == max))
{
diff --git a/src/hints.c b/src/hints.c
index 0467c6c92c70b8f180900d0bc2ca12209cd36a0b..4597a1ab495d8eca7014955faf12bb0f178b0ebe 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -36,6 +36,7 @@
#include <X11/Xmd.h>
#include <libxfce4util/debug.h>
#include <libxfce4util/i18n.h>
+#include <libxfcegui4/xinerama.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -525,8 +526,8 @@ void set_net_workarea(Display * dpy, int screen, int nb_workspaces, CARD32 * m)
{
*ptr++ = m[MARGIN_LEFT];
*ptr++ = m[MARGIN_TOP];
- *ptr++ = XDisplayWidth(dpy, screen) - (m[MARGIN_LEFT] + m[MARGIN_RIGHT]);
- *ptr++ = XDisplayHeight(dpy, screen) - (m[MARGIN_TOP] + m[MARGIN_BOTTOM]);
+ *ptr++ = MyDisplayFullWidth(dpy, screen) - (m[MARGIN_LEFT] + m[MARGIN_RIGHT]);
+ *ptr++ = MyDisplayFullHeight(dpy, screen) - (m[MARGIN_TOP] + m[MARGIN_BOTTOM]);
}
XChangeProperty(dpy, RootWindow(dpy, screen), net_workarea, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, j * 4);
free(data);
@@ -536,8 +537,8 @@ void init_net_desktop_params(Display * dpy, int screen, int workspace)
{
unsigned long data[2];
TRACE("entering init_net_desktop_params");
- data[0] = XDisplayWidth(dpy, screen);
- data[1] = XDisplayHeight(dpy, screen);
+ data[0] = MyDisplayFullWidth(dpy, screen);
+ data[1] = MyDisplayFullHeight(dpy, screen);
XChangeProperty(dpy, RootWindow(dpy, screen), net_desktop_geometry, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 2);
data[0] = 0;
data[1] = 0;
diff --git a/src/misc.c b/src/misc.c
index cd423810cdc2903f1432db1a44b9821268dc212e..a4c41c5dd3811d518116b076b755a1738cf8ed61 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -38,6 +38,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <libxfce4util/debug.h>
+#include <libxfcegui4/xinerama.h>
#include "main.h"
#include "client.h"
@@ -148,7 +149,7 @@ Window setTmpEventWin(long eventmask)
XSetWindowAttributes attributes;
attributes.event_mask = eventmask;
attributes.override_redirect = TRUE;
- w = XCreateWindow(dpy, root, 0, 0, XDisplayWidth(dpy, screen), XDisplayHeight(dpy, screen), 0, 0, InputOnly, CopyFromParent, CWEventMask, &attributes);
+ w = XCreateWindow(dpy, root, 0, 0, MyDisplayFullWidth(dpy, screen), MyDisplayFullHeight(dpy, screen), 0, 0, InputOnly, CopyFromParent, CWEventMask, &attributes);
XMapRaised(dpy, w);
return (w);
}
diff --git a/src/settings.c b/src/settings.c
index dee2e157733b80b9055cf60584967ddd9427014e..12da551e7b94631aaa184458a6ac7d3a8e4a51e1 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -61,9 +61,9 @@ static void set_settings_margin(int idx, int value)
{
val = 0;
}
- else if(value > XDisplayWidth(dpy, screen) / 4)
+ else if(value > MyDisplayFullWidth(dpy, screen) / 4)
{
- val = XDisplayWidth(dpy, screen) / 4;
+ val = MyDisplayFullWidth(dpy, screen) / 4;
}
else
{
@@ -77,9 +77,9 @@ static void set_settings_margin(int idx, int value)
{
val = 0;
}
- else if(value > XDisplayHeight(dpy, screen) / 4)
+ else if(value > MyDisplayFullHeight(dpy, screen) / 4)
{
- val = XDisplayHeight(dpy, screen) / 4;
+ val = MyDisplayFullHeight(dpy, screen) / 4;
}
else
{
diff --git a/src/workspaces.c b/src/workspaces.c
index 4757e0bce1e9d9864583430604fe290498a39dca..e5fcd6b5ae0250cd91a977610bde4fd8927c7f7f 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -172,7 +172,7 @@ void workspaceSetCount(int count)
{
workspaceSwitch(count - 1, NULL);
}
- set_net_workarea(dpy, root, params.workspace_count, margins);
+ set_net_workarea(dpy, screen, params.workspace_count, margins);
}
void workspaceGetArea(CARD32 * m1, CARD32 * m2, Client * c)
diff --git a/themes/Makefile.in b/themes/Makefile.in
index e174b77d9c016290e824326eb641d7b53fc42b31..d640c94752c71a4dbe3ec4aba2ca496b8330d01f 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -181,7 +181,6 @@ SUBDIRS = \
tgc
subdir = themes
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -293,15 +292,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
diff --git a/themes/bbs/Makefile.in b/themes/bbs/Makefile.in
index 9bbb877335aa886fce78fb409e2a151fe2af84e1..363afa59e512298a88c23daa2cc2a183cdc62732 100644
--- a/themes/bbs/Makefile.in
+++ b/themes/bbs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/bbs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/curve/Makefile.in b/themes/curve/Makefile.in
index ebab2471d00ab2c6f698f1f11170ffe08865d813..e3398cddcea676aad80d3b761449780886e3f679 100644
--- a/themes/curve/Makefile.in
+++ b/themes/curve/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/curve
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/default.keys/Makefile.in b/themes/default.keys/Makefile.in
index 437998355b03e1c44c7de32e7b29d456055cd333..01fec7f8a264ac32a91c997239b919edd8616c99 100644
--- a/themes/default.keys/Makefile.in
+++ b/themes/default.keys/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -167,7 +167,6 @@ themedir = $(pkgdatadir)/themes/default.keys
theme_DATA = keythemerc
EXTRA_DIST = $(theme_DATA)
subdir = themes/default.keys
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
index 8b4a2eba5c045b38d3fc67ea7c6d22d815ea5287..2b910357775eaa9adefc32c241660c0c16b30842 100644
--- a/themes/default/Makefile.in
+++ b/themes/default/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -220,7 +220,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/default
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/exocet/Makefile.in b/themes/exocet/Makefile.in
index 5f121c70af5e3bf9e49319be6a82f4dd95b1881b..82a9e9ef85f48847d3fdab2eb21dcc04b9ef8c15 100644
--- a/themes/exocet/Makefile.in
+++ b/themes/exocet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/exocet
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/meenee/Makefile.in b/themes/meenee/Makefile.in
index 48988dc0cea21b57bb9d267bc1417416211ebdad..539c6abcb9c2825b7c406ed8fa999d56acc697a1 100644
--- a/themes/meenee/Makefile.in
+++ b/themes/meenee/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/meenee
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/microcurve/Makefile.in b/themes/microcurve/Makefile.in
index d94b74a95b5b8d461ab636d6a89451bd93769aa1..bfc06b195b45308de6583b40f8cc9d5090dd924d 100644
--- a/themes/microcurve/Makefile.in
+++ b/themes/microcurve/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/microcurve
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/microdeck/Makefile.in b/themes/microdeck/Makefile.in
index 5938d3b329121ee6387811b98d83bd1b04ad5b80..8b18d7975f0c50d8ddf798e8ad3dcf98542793b2 100644
--- a/themes/microdeck/Makefile.in
+++ b/themes/microdeck/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -220,7 +220,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/microdeck
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/microdeck2/Makefile.in b/themes/microdeck2/Makefile.in
index c025b5f3d55ceccae8adaf64426a70121e395f76..a915f6784d9a8d77fc074d38cd9d024d49c6dd90 100644
--- a/themes/microdeck2/Makefile.in
+++ b/themes/microdeck2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/microdeck2
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/microdeck3/Makefile.in b/themes/microdeck3/Makefile.in
index d1b897d368aec69ba266b88ef5be2aa192b8833d..2b33398cc3ec30bc027778edd00433e528c1d24a 100644
--- a/themes/microdeck3/Makefile.in
+++ b/themes/microdeck3/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/microdeck3
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
diff --git a/themes/tgc/Makefile.in b/themes/tgc/Makefile.in
index ffb6d739c12c696c184e6fb388594eccb12a6ed4..6e3af323879ed6a71025205eac1e01c968d927db 100644
--- a/themes/tgc/Makefile.in
+++ b/themes/tgc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,7 +211,6 @@ theme_DATA = README \
EXTRA_DIST = $(theme_DATA)
subdir = themes/tgc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =