diff -u compiz-0.3.6/debian/control compiz-0.3.6/debian/control --- compiz-0.3.6/debian/control +++ compiz-0.3.6/debian/control @@ -1,8 +1,9 @@ Source: compiz Section: x11 Priority: optional -Maintainer: Quinn Storm -Build-Depends: librsvg2-dev, libmetacity-dev, debhelper (>= 4.0.0), cdbs, intltool, autotools-dev, pkg-config, libgnome-desktop-dev, libcairo2-dev, libpng12-dev, libxdamage-dev,libxcomposite-dev, libxfixes-dev, libxrandr-dev, libice-dev, libsm-dev, libstartup-notification0-dev, libgl1-mesa-dev, libgconf2-dev, libglib2.0-dev, libgtk2.0-dev, libwnck-dev, libpango1.0-dev, gnome-control-center, libgnomeui-dev, capplets-data, x11proto-gl-dev, libgnome-window-settings-dev | capplets-data (<< 1:2.15.0), libqt3-mt-dev, kdebase-dev, libdbus-qt-1-dev, libdbus-glib-1-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Quinn Storm +Build-Depends: librsvg2-dev, libmetacity-dev, debhelper (>= 4.0.0), cdbs, intltool, autotools-dev, pkg-config, libgnome-desktop-dev, libcairo2-dev, libpng12-dev, libxdamage-dev,libxcomposite-dev, libxfixes-dev, libxrandr-dev, libice-dev, libsm-dev, libstartup-notification0-dev, libgl1-mesa-dev, libgconf2-dev, libglib2.0-dev, libgtk2.0-dev, libwnck-dev, libpango1.0-dev, gnome-control-center, libgnomeui-dev, capplets-data, x11proto-gl-dev, libgnome-window-settings-dev | capplets-data (<< 1:2.15.0), libqt3-mt-dev, kdebase-dev, libdbus-qt-1-dev, libdbus-glib-1-dev, libxcursor-dev Standards-Version: 3.7.2 Package: compiz diff -u compiz-0.3.6/debian/changelog compiz-0.3.6/debian/changelog --- compiz-0.3.6/debian/changelog +++ compiz-0.3.6/debian/changelog @@ -1,3 +1,17 @@ +compiz (1:0.3.6-1ubuntu4) feisty; urgency=low + + * debian/control: + - the package is maintained by the Ubuntu MOTU Developers + - add libxcursor-dev build-dep + * debian/patches/10-init-inotify-struct.patch: + - initialize inotify struct on startup (Ubuntu: #82336) + * debian/patches/11-fix-mouse-move-key.patch: + - fix mouse mouse move key gconf entry (Ubuntu: #86378) + * debian/patches/93-add-cursor-theme-support.patch: + - add cursor theme and size support (Ubuntu: #86184) + + -- Nicolas Bruguier Wed, 21 Feb 2007 00:09:38 +0100 + compiz (1:0.3.6-1ubuntu3) feisty; urgency=low * debian/control only in patch2: unchanged: --- compiz-0.3.6.orig/debian/patches/93-add-cursor-theme-support.patch +++ compiz-0.3.6/debian/patches/93-add-cursor-theme-support.patch @@ -0,0 +1,253 @@ +diff -ruN compiz-0.3.6.orig/configure.ac compiz-0.3.6/configure.ac +--- compiz-0.3.6.orig/configure.ac 2007-02-21 00:00:10.000000000 +0100 ++++ compiz-0.3.6/configure.ac 2007-02-21 00:00:24.000000000 +0100 +@@ -89,6 +89,7 @@ + xdamage \ + xrandr \ + xinerama \ ++ xcursor \ + ice \ + sm \ + libstartup-notification-1.0 >= 0.7" +diff -ruN compiz-0.3.6.orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.3.6/gtk/window-decorator/gtk-window-decorator.c +--- compiz-0.3.6.orig/gtk/window-decorator/gtk-window-decorator.c 2007-02-21 00:00:10.000000000 +0100 ++++ compiz-0.3.6/gtk/window-decorator/gtk-window-decorator.c 2007-02-21 00:03:05.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #ifndef GTK_DISABLE_DEPRECATED + #define GTK_DISABLE_DEPRECATED +@@ -75,6 +76,14 @@ + #include + #endif + ++#define GNOME_MOUSE_DIR "/desktop/gnome/peripherals/mouse" ++ ++#define GNOME_CURSOR_THEME_KEY \ ++ GNOME_MOUSE_DIR "/cursor_theme" ++ ++#define GNOME_CURSOR_SIZE_KEY \ ++ GNOME_MOUSE_DIR "/cursor_size" ++ + #define METACITY_GCONF_DIR "/apps/metacity/general" + + #define COMPIZ_USE_SYSTEM_FONT_KEY \ +@@ -120,6 +129,12 @@ + #define COMPIZ_AUDIBLE_BELL_KEY \ + COMPIZ_GCONF_DIR2 "/audible_bell" + ++#define COMPIZ_CURSOR_THEME_KEY \ ++ COMPIZ_GCONF_DIR2 "/cursor_theme" ++ ++#define COMPIZ_CURSOR_SIZE_KEY \ ++ COMPIZ_GCONF_DIR2 "/cursor_size" ++ + #define COMPIZ_GCONF_DIR3 "/apps/compiz/plugins/fade/screen0/options" + + #define COMPIZ_VISUAL_BELL_KEY \ +@@ -5537,6 +5552,47 @@ + } + + static void ++cursor_theme_changed (GConfClient *client) ++{ ++ gchar *theme; ++ gint size; ++ ++ theme = gconf_client_get_string(client, GNOME_CURSOR_THEME_KEY, ++ NULL); ++ size = gconf_client_get_int(client, GNOME_CURSOR_SIZE_KEY, NULL); ++ ++ gconf_client_set_string(client, COMPIZ_CURSOR_THEME_KEY, ++ theme, NULL); ++ ++ gconf_client_set_int(client, COMPIZ_CURSOR_SIZE_KEY, ++ size, NULL); ++ ++ if (theme && strlen(theme)) ++ { ++ gint i, j; ++ GdkDisplay *gdkdisplay = gdk_display_get_default (); ++ Display *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay); ++ ++ ++ XcursorSetTheme (xdisplay, theme); ++ XcursorSetDefaultSize (xdisplay, size); ++ ++ for (i = 0; i < 3; i++) ++ { ++ for (j = 0; j < 3; j++) ++ { ++ if (cursor[i][j].shape != XC_left_ptr) ++ { ++ XFreeCursor (xdisplay, cursor[i][j].cursor); ++ cursor[i][j].cursor = ++ XCreateFontCursor (xdisplay, cursor[i][j].shape); ++ } ++ } ++ } ++ } ++} ++ ++static void + value_changed (GConfClient *client, + const gchar *key, + GConfValue *value, +@@ -5592,6 +5648,12 @@ + if (theme_opacity_changed (client)) + changed = TRUE; + } ++ else if (strcmp (key, GNOME_CURSOR_THEME_KEY) == 0 || ++ strcmp (key, GNOME_CURSOR_SIZE_KEY) == 0) ++ { ++ cursor_theme_changed (client); ++ } ++ + + if (changed) + decorations_changed (data); +@@ -5753,6 +5815,11 @@ + GCONF_CLIENT_PRELOAD_ONELEVEL, + NULL); + ++ gconf_client_add_dir (gconf, ++ GNOME_MOUSE_DIR, ++ GCONF_CLIENT_PRELOAD_ONELEVEL, ++ NULL); ++ + gconf_client_add_dir (gconf, + COMPIZ_GCONF_DIR1, + GCONF_CLIENT_PRELOAD_ONELEVEL, +@@ -5772,6 +5839,8 @@ + "value_changed", + G_CALLBACK (value_changed), + screen); ++ ++ cursor_theme_changed(gconf); + #elif USE_DBUS_GLIB + DBusConnection *connection; + DBusMessage *reply; +diff -ruN compiz-0.3.6.orig/include/compiz.h compiz-0.3.6/include/compiz.h +--- compiz-0.3.6.orig/include/compiz.h 2007-02-21 00:00:10.000000000 +0100 ++++ compiz-0.3.6/include/compiz.h 2007-02-21 00:00:24.000000000 +0100 +@@ -573,7 +573,9 @@ + #define COMP_DISPLAY_OPTION_SWITCH_TO_DOWN_DESKTOP_WINDOW 87 + #define COMP_DISPLAY_OPTION_TERMINAL 88 + #define COMP_DISPLAY_OPTION_RUN_TERMINAL 89 +-#define COMP_DISPLAY_OPTION_NUM 90 ++#define COMP_DISPLAY_OPTION_CURSOR_THEME 90 ++#define COMP_DISPLAY_OPTION_CURSOR_SIZE 91 ++#define COMP_DISPLAY_OPTION_NUM 92 + + typedef CompOption *(*GetDisplayOptionsProc) (CompDisplay *display, + int *count); +diff -ruN compiz-0.3.6.orig/src/display.c compiz-0.3.6/src/display.c +--- compiz-0.3.6.orig/src/display.c 2007-02-21 00:00:10.000000000 +0100 ++++ compiz-0.3.6/src/display.c 2007-02-21 00:00:24.000000000 +0100 +@@ -43,6 +43,8 @@ + #include + #include + #include ++#include ++#include + + #include + +@@ -167,6 +169,10 @@ + + #define IGNORE_HINTS_WHEN_MAXIMIZED_DEFAULT TRUE + ++#define CURSOR_SIZE_DEFAULT 18 ++#define CURSOR_SIZE_MIN 8 ++#define CURSOR_SIZE_MAX 128 ++ + #define NUM_OPTIONS(d) (sizeof ((d)->opt) / sizeof (CompOption)) + + static char *textureFilter[] = { N_("Fast"), N_("Good"), N_("Best") }; +@@ -969,6 +975,34 @@ + } + + static void ++compDisplaySetCursorTheme (CompDisplay *display) ++{ ++ char *theme = display->opt[COMP_DISPLAY_OPTION_CURSOR_THEME].value.s; ++ int size = display->opt[COMP_DISPLAY_OPTION_CURSOR_SIZE].value.i; ++ ++ if (theme && strlen(theme)) ++ { ++ CompScreen *s; ++ ++ XcursorSetTheme (display->display, theme); ++ XcursorSetDefaultSize (display->display, size); ++ for (s = display->screens; s; s = s->next) ++ { ++ XFreeCursor (display->display, s->normalCursor); ++ s->busyCursor = XCreateFontCursor (display->display, ++ XC_watch); ++ XFlush (display->display); ++ ++ XFreeCursor (display->display, s->normalCursor); ++ s->normalCursor = XCreateFontCursor (display->display, ++ XC_left_ptr); ++ XDefineCursor (display->display, s->root, s->normalCursor); ++ XFlush (display->display); ++ } ++ } ++} ++ ++static void + compDisplayInitOptions (CompDisplay *display, + char **plugin, + int nPlugin) +@@ -1566,6 +1600,25 @@ + o->value.action.state = CompActionStateInitKey; + o->value.action.state |= CompActionStateInitButton; + o->value.action.type = CompBindingTypeNone; ++ ++ ++ o = &display->opt[COMP_DISPLAY_OPTION_CURSOR_THEME]; ++ o->name = "cursor_theme"; ++ o->shortDesc = N_("Cursor theme"); ++ o->longDesc = N_("Cursor theme name"); ++ o->type = CompOptionTypeString; ++ o->value.s = strdup (""); ++ o->rest.s.string = NULL; ++ o->rest.s.nString = 0; ++ ++ o = &display->opt[COMP_DISPLAY_OPTION_CURSOR_SIZE]; ++ o->name = "cursor_size"; ++ o->shortDesc = N_("Cursor size"); ++ o->longDesc = N_("Size of the cursor referenced by cursor_theme."); ++ o->type = CompOptionTypeInt; ++ o->value.i = CURSOR_SIZE_DEFAULT; ++ o->rest.i.min = CURSOR_SIZE_MIN; ++ o->rest.i.max = CURSOR_SIZE_MAX; + } + + CompOption * +@@ -1728,7 +1781,21 @@ + setAudibleBell (display, o->value.b); + return TRUE; + } +- default: ++ case COMP_DISPLAY_OPTION_CURSOR_THEME: ++ if (compSetStringOption(o, value)) ++ { ++ compDisplaySetCursorTheme(display); ++ return TRUE; ++ } ++ break; ++ case COMP_DISPLAY_OPTION_CURSOR_SIZE: ++ if (compSetIntOption(o, value)) ++ { ++ compDisplaySetCursorTheme(display); ++ return TRUE; ++ } ++ break; ++ default: + break; + } + only in patch2: unchanged: --- compiz-0.3.6.orig/debian/patches/10-init-inotify-struct.patch +++ compiz-0.3.6/debian/patches/10-init-inotify-struct.patch @@ -0,0 +1,28 @@ +commit c69f76fe38c4ddf17a6792d0f8f53c3c42f74c29 +Author: Nicolas Bruguier +Date: Mon Feb 19 23:05:53 2007 +0100 + + Initialize CompInotify structure + +diff --git a/plugins/inotify.c b/plugins/inotify.c +index 84c34e1..7dbd5ec 100644 +--- a/plugins/inotify.c ++++ b/plugins/inotify.c +@@ -25,6 +25,7 @@ + + #include + #include ++#include + #include + #include + +@@ -184,7 +185,8 @@ inotifyInitDisplay (CompPlugin *p, + id = malloc (sizeof (InotifyDisplay)); + if (!id) + return FALSE; +- ++ memset (id, 0, sizeof (InotifyDisplay)); ++ + id->fd = inotify_init (); + if (id->fd < 0) + { only in patch2: unchanged: --- compiz-0.3.6.orig/debian/patches/93-add-cursor-theme-support-configure.patch +++ compiz-0.3.6/debian/patches/93-add-cursor-theme-support-configure.patch @@ -0,0 +1,5204 @@ +--- compiz-0.3.6.orig/configure 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/configure 2007-02-20 23:33:17.000000000 +0100 +@@ -816,16 +816,13 @@ + AUTOMAKE + AUTOHEADER + MAKEINFO ++AMTAR + install_sh + STRIP + INSTALL_STRIP_PROGRAM +-mkdir_p + AWK + SET_MAKE + am__leading_dot +-AMTAR +-am__tar +-am__untar + MAINTAINER_MODE_TRUE + MAINTAINER_MODE_FALSE + MAINT +@@ -1577,10 +1574,10 @@ + Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer +- --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer ++ --disable-dependency-tracking Speeds up one-time builds ++ --enable-dependency-tracking Do not reject slow dependency extractors + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] +@@ -2139,7 +2136,7 @@ + + + +-am__api_version="1.9" ++am__api_version="1.7" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -2278,6 +2275,7 @@ + program_transform_name=`echo $program_transform_name | sed -f conftest.sed` + rm -f conftest.sed + ++ + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + +@@ -2291,39 +2289,6 @@ + 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)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +- + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -2405,7 +2370,7 @@ + fi + rmdir .tst 2>/dev/null + +-# test to see if srcdir already configured ++ # 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 +@@ -2453,6 +2418,9 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ + install_sh=${install_sh-"$am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user +@@ -2561,13 +2529,6 @@ + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +-# Always define AMTAR for backward compatibility. +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +- +- + + + +@@ -3630,9 +3591,7 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -3660,14 +3619,9 @@ + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi +@@ -4499,9 +4453,7 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -4529,14 +4481,9 @@ + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi +@@ -5202,9 +5149,7 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -5232,14 +5177,9 @@ + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi +@@ -5891,7 +5831,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -5945,11 +5885,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -6065,7 +6005,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6068 "configure"' > conftest.$ac_ext ++ echo '#line 6008 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7288,7 +7228,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -8021,67 +7961,6 @@ + + test -z "$pic_mode" && pic_mode=default + +-# Check if we have a version mismatch between libtool.m4 and ltmain.sh. +-# +-# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. +-# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually +-# calls AC_LIBTOOL_CONFIG and creates libtool. +-# +-{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5 +-echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; } +-if test "x$ltmain" = "x" ; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- { { echo "$as_me:$LINENO: error: +- +-*** [Gentoo] sanity check failed! *** +-*** \$ltmain is not defined, please check the patch for consistency! *** +-" >&5 +-echo "$as_me: error: +- +-*** [Gentoo] sanity check failed! *** +-*** \$ltmain is not defined, please check the patch for consistency! *** +-" >&2;} +- { (exit 1); exit 1; }; } +-fi +-gentoo_lt_version="1.5.22" +-gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"` +-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- { { echo "$as_me:$LINENO: error: +- +-*** [Gentoo] sanity check failed! *** +-*** libtool.m4 and ltmain.sh have a version mismatch! *** +-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** +- +-Please run: +- +- libtoolize --copy --force +- +-if appropriate, please contact the maintainer of this +-package (or your distribution) for help. +-" >&5 +-echo "$as_me: error: +- +-*** [Gentoo] sanity check failed! *** +-*** libtool.m4 and ltmain.sh have a version mismatch! *** +-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** +- +-Please run: +- +- libtoolize --copy --force +- +-if appropriate, please contact the maintainer of this +-package (or your distribution) for help. +-" >&2;} +- { (exit 1); exit 1; }; } +-else +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-fi +- +- + # Use C for the default configuration in the libtool script + tagname= + lt_save_CC="$CC" +@@ -8155,11 +8034,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8158: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8037: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8162: \$? = $ac_status" >&5 ++ echo "$as_me:8041: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8317,7 +8196,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' +@@ -8423,11 +8302,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8426: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8305: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8430: \$? = $ac_status" >&5 ++ echo "$as_me:8309: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8527,11 +8406,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8530: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8409: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8534: \$? = $ac_status" >&5 ++ echo "$as_me:8413: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8756,7 +8635,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -8782,12 +8661,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -9215,7 +9095,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -9317,7 +9197,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9766,30 +9646,6 @@ + esac + ;; + +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- else +- $archive_expsym_cmds="$archive_cmds" +- fi +- else +- ld_shlibs=no +- fi +- ;; +- + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; +@@ -9831,18 +9687,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -9854,14 +9698,7 @@ + *) objformat=elf ;; + esac + fi +- # Handle Gentoo/FreeBSD as it was Linux +- case $host_vendor in +- gentoo) +- version_type=linux ;; +- *) +- version_type=freebsd-$objformat ;; +- esac +- ++ version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +@@ -9872,12 +9709,6 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; +- linux) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- need_lib_prefix=no +- need_version=no +- ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +@@ -10011,7 +9842,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10040,7 +9871,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10049,7 +9880,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -10872,7 +10703,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -13113,7 +12944,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -13156,7 +12987,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -13199,7 +13030,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -13308,11 +13139,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13311: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13142: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13315: \$? = $ac_status" >&5 ++ echo "$as_me:13146: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -13412,11 +13243,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13415: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13246: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13419: \$? = $ac_status" >&5 ++ echo "$as_me:13250: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13484,6 +13315,9 @@ + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -13722,30 +13556,6 @@ + esac + ;; + +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- else +- $archive_expsym_cmds="$archive_cmds" +- fi +- else +- ld_shlibs=no +- fi +- ;; +- + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; +@@ -13787,18 +13597,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -13810,14 +13608,7 @@ + *) objformat=elf ;; + esac + fi +- # Handle Gentoo/FreeBSD as it was Linux +- case $host_vendor in +- gentoo) +- version_type=linux ;; +- *) +- version_type=freebsd-$objformat ;; +- esac +- ++ version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +@@ -13828,12 +13619,6 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; +- linux) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- need_lib_prefix=no +- need_version=no +- ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +@@ -13967,7 +13752,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13996,7 +13781,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -14005,7 +13790,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -14913,7 +14698,7 @@ + lt_prog_compiler_static_F77='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' +@@ -15019,11 +14804,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15022: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14807: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15026: \$? = $ac_status" >&5 ++ echo "$as_me:14811: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15123,11 +14908,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15126: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14911: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15130: \$? = $ac_status" >&5 ++ echo "$as_me:14915: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15352,7 +15137,7 @@ + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -15378,12 +15163,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -15791,7 +15577,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -15893,7 +15679,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -16342,30 +16128,6 @@ + esac + ;; + +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- else +- $archive_expsym_cmds="$archive_cmds" +- fi +- else +- ld_shlibs=no +- fi +- ;; +- + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; +@@ -16407,18 +16169,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -16430,14 +16180,7 @@ + *) objformat=elf ;; + esac + fi +- # Handle Gentoo/FreeBSD as it was Linux +- case $host_vendor in +- gentoo) +- version_type=linux ;; +- *) +- version_type=freebsd-$objformat ;; +- esac +- ++ version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +@@ -16448,12 +16191,6 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; +- linux) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- need_lib_prefix=no +- need_version=no +- ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +@@ -16587,7 +16324,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16616,7 +16353,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16625,7 +16362,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -17358,11 +17095,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17361: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17098: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17365: \$? = $ac_status" >&5 ++ echo "$as_me:17102: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17520,7 +17257,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -17626,11 +17363,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17629: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17366: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17633: \$? = $ac_status" >&5 ++ echo "$as_me:17370: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17730,11 +17467,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17733: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17470: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17737: \$? = $ac_status" >&5 ++ echo "$as_me:17474: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17959,7 +17696,7 @@ + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -17985,12 +17722,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -18418,7 +18156,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -18520,7 +18258,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -18969,30 +18707,6 @@ + esac + ;; + +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- else +- $archive_expsym_cmds="$archive_cmds" +- fi +- else +- ld_shlibs=no +- fi +- ;; +- + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; +@@ -19034,18 +18748,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -19057,14 +18759,7 @@ + *) objformat=elf ;; + esac + fi +- # Handle Gentoo/FreeBSD as it was Linux +- case $host_vendor in +- gentoo) +- version_type=linux ;; +- *) +- version_type=freebsd-$objformat ;; +- esac +- ++ version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +@@ -19075,12 +18770,6 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; +- linux) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- need_lib_prefix=no +- need_version=no +- ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +@@ -19214,7 +18903,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -19243,7 +18932,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -19252,7 +18941,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -22556,6 +22245,7 @@ + xdamage \ + xrandr \ + xinerama \ ++ xcursor \ + ice \ + sm \ + libstartup-notification-1.0 >= 0.7" +@@ -25379,16 +25069,13 @@ + AUTOMAKE!$AUTOMAKE$ac_delim + AUTOHEADER!$AUTOHEADER$ac_delim + MAKEINFO!$MAKEINFO$ac_delim ++AMTAR!$AMTAR$ac_delim + install_sh!$install_sh$ac_delim + STRIP!$STRIP$ac_delim + INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +-mkdir_p!$mkdir_p$ac_delim + AWK!$AWK$ac_delim + SET_MAKE!$SET_MAKE$ac_delim + am__leading_dot!$am__leading_dot$ac_delim +-AMTAR!$AMTAR$ac_delim +-am__tar!$am__tar$ac_delim +-am__untar!$am__untar$ac_delim + MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim + MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim + MAINT!$MAINT$ac_delim +@@ -25428,6 +25115,9 @@ + LN_S!$LN_S$ac_delim + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim ++RANLIB!$RANLIB$ac_delim ++CXXCPP!$CXXCPP$ac_delim ++F77!$F77$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -25469,9 +25159,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-RANLIB!$RANLIB$ac_delim +-CXXCPP!$CXXCPP$ac_delim +-F77!$F77$ac_delim + FFLAGS!$FFLAGS$ac_delim + ac_ct_F77!$ac_ct_F77$ac_delim + LIBTOOL!$LIBTOOL$ac_delim +@@ -25563,7 +25250,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -26035,21 +25722,27 @@ + else + continue + fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue ++ # Extract the definition of DEP_FILES from the Makefile without ++ # running `make'. ++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ U=`sed -n -e '/^U = / s///p' < "$mf"` ++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ++ # We invoke sed twice because it is the simplest approach to ++ # changing $(DEPDIR) to its actual value in the expansion. ++ for file in `sed -n -e ' ++ /^DEP_FILES = .*\\\\$/ { ++ s/^DEP_FILES = // ++ :loop ++ s/\\\\$// ++ p ++ n ++ /\\\\$/ b loop ++ p ++ } ++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +--- compiz-0.3.6.orig/gtk/gnome/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/gtk/gnome/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,7 +14,6 @@ + + @SET_MAKE@ + +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -22,6 +21,7 @@ + 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 +@@ -35,42 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = gtk/gnome +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/compiz.desktop.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = compiz.desktop +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libcompiz_la_DEPENDENCIES = +-am__libcompiz_la_SOURCES_DIST = compiz-window-manager.c \ +- compiz-window-manager.h +-@USE_GNOME_TRUE@am_libcompiz_la_OBJECTS = compiz-window-manager.lo +-libcompiz_la_OBJECTS = $(am_libcompiz_la_OBJECTS) +-@USE_GNOME_TRUE@am_libcompiz_la_rpath = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/config/depcomp +-am__depfiles_maybe = depfiles +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(libcompiz_la_SOURCES) +-DIST_SOURCES = $(am__libcompiz_la_SOURCES_DIST) +-DATA = $(noinst_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -218,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -246,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -260,6 +222,7 @@ + windowsettingsdatadir = @windowsettingsdatadir@ + windowsettingslibdir = @windowsettingslibdir@ + moduledir = $(DESTDIR)$(windowsettingslibdir)/libgnome-window-settings1 ++ + @USE_GNOME_TRUE@libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir) + @USE_GNOME_TRUE@libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@ + @USE_GNOME_TRUE@libcompiz_la_SOURCES = \ +@@ -267,65 +230,75 @@ + @USE_GNOME_TRUE@ compiz-window-manager.h + + @USE_GNOME_TRUE@libcompiz_module = libcompiz.la ++ + @USE_GNOME_TRUE@desktopfilesdir = $(DESTDIR)$(windowsettingsdatadir)/gnome/wm-properties + @USE_GNOME_TRUE@desktopfiles_in_files = compiz.desktop.in + @USE_GNOME_TRUE@desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop) + @USE_GNOME_TRUE@noinst_DATA = $(desktopfiles_files) ++ + INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \ + -DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" + ++ + noinst_LTLIBRARIES = \ + $(libcompiz_module) + ++subdir = gtk/gnome ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = compiz.desktop ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++@USE_GNOME_TRUE@libcompiz_la_DEPENDENCIES = ++@USE_GNOME_FALSE@libcompiz_la_DEPENDENCIES = ++am__libcompiz_la_SOURCES_DIST = compiz-window-manager.c \ ++ compiz-window-manager.h ++@USE_GNOME_TRUE@am_libcompiz_la_OBJECTS = compiz-window-manager.lo ++libcompiz_la_OBJECTS = $(am_libcompiz_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/config/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/compiz-window-manager.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(am__libcompiz_la_SOURCES_DIST) ++DATA = $(noinst_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am compiz.desktop.in ++SOURCES = $(libcompiz_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/gnome/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/gnome/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-compiz.desktop: $(top_builddir)/config.status $(srcdir)/compiz.desktop.in ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++compiz.desktop: $(top_builddir)/config.status compiz.desktop.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libcompiz.la: $(libcompiz_la_OBJECTS) $(libcompiz_la_DEPENDENCIES) +- $(LINK) $(am_libcompiz_la_rpath) $(libcompiz_la_LDFLAGS) $(libcompiz_la_OBJECTS) $(libcompiz_la_LIBADD) $(LIBS) ++ $(LINK) $(libcompiz_la_LDFLAGS) $(libcompiz_la_OBJECTS) $(libcompiz_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -333,25 +306,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compiz-window-manager.Plo@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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -363,6 +348,14 @@ + -rm -f libtool + uninstall-info-am: + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -371,7 +364,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -383,11 +375,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -410,6 +401,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -423,7 +418,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -441,6 +436,7 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: + install: install-am + install-exec: install-exec-am +@@ -461,14 +457,11 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +-@USE_GNOME_FALSE@uninstall-local: +-@USE_GNOME_FALSE@install-data-local: +-@USE_GNOME_FALSE@install-exec-local: + clean: clean-am + + clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ +@@ -484,8 +477,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -523,15 +514,14 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local 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 mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am uninstall-local ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ 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 mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-info-am uninstall-local + + + @USE_GNOME_TRUE@install-exec-local: +--- compiz-0.3.6.orig/gtk/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/gtk/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,6 +13,7 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -20,6 +21,7 @@ + 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 +@@ -33,29 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = gtk +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -203,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -231,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -245,38 +222,28 @@ + windowsettingsdatadir = @windowsettingsdatadir@ + windowsettingslibdir = @windowsettingslibdir@ + SUBDIRS = window-decorator gnome ++subdir = gtk ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -295,13 +262,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -313,7 +274,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -321,13 +282,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -348,7 +303,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -359,6 +314,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -367,22 +330,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -392,11 +352,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -419,6 +378,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -432,7 +395,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -447,17 +410,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -467,6 +428,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -486,7 +448,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -504,8 +466,6 @@ + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: +@@ -540,18 +500,22 @@ + + uninstall-info: uninstall-info-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ +- 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-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ distclean-recursive distclean-tags distdir dvi dvi-am \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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. +--- compiz-0.3.6.orig/gtk/window-decorator/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/gtk/window-decorator/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,7 +14,6 @@ + + @SET_MAKE@ + +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -22,6 +21,7 @@ + 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 +@@ -35,52 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = $(am__EXEEXT_1) +-subdir = gtk/window-decorator +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/gwd.schemas.in TODO +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = gwd.schemas +-@USE_GTK_TRUE@am__EXEEXT_1 = gtk-window-decorator$(EXEEXT) +-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(schemadir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(bin_PROGRAMS) +-am__gtk_window_decorator_SOURCES_DIST = gtk-window-decorator.c +-@USE_GTK_TRUE@am_gtk_window_decorator_OBJECTS = \ +-@USE_GTK_TRUE@ gtk-window-decorator.$(OBJEXT) +-gtk_window_decorator_OBJECTS = $(am_gtk_window_decorator_OBJECTS) +-am__DEPENDENCIES_1 = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/config/depcomp +-am__depfiles_maybe = depfiles +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(gtk_window_decorator_SOURCES) +-DIST_SOURCES = $(am__gtk_window_decorator_SOURCES_DIST) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-schemaDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(schema_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -228,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -256,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -269,7 +221,9 @@ + target_alias = @target_alias@ + windowsettingsdatadir = @windowsettingsdatadir@ + windowsettingslibdir = @windowsettingslibdir@ ++ + @USE_GTK_TRUE@@USE_METACITY_TRUE@metacitylibs = @METACITY_LIBS@ ++ + @USE_GTK_TRUE@gtk_window_decorator_DEPENDENCIES = \ + @USE_GTK_TRUE@ $(top_builddir)/libdecoration/libdecoration.la + +@@ -284,57 +238,73 @@ + @USE_GTK_TRUE@ gtk-window-decorator.c + + @USE_GTK_TRUE@gtk_window_decorator_program = gtk-window-decorator ++ + @USE_GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR) + @USE_GCONF_TRUE@schema_in_files = gwd.schemas.in + @USE_GCONF_TRUE@schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + INCLUDES = -I$(top_srcdir)/include @GTK_WINDOW_DECORATOR_CFLAGS@ @METACITY_CFLAGS@ @GCONF_CFLAGS@ @DBUS_GLIB_CFLAGS@ ++ ++bin_PROGRAMS = $(gtk_window_decorator_program) ++ + EXTRA_DIST = $(schema_in_files) ++subdir = gtk/window-decorator ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = gwd.schemas ++@USE_GTK_TRUE@bin_PROGRAMS = gtk-window-decorator$(EXEEXT) ++@USE_GTK_FALSE@bin_PROGRAMS = ++PROGRAMS = $(bin_PROGRAMS) ++ ++am__gtk_window_decorator_SOURCES_DIST = gtk-window-decorator.c ++@USE_GTK_TRUE@am_gtk_window_decorator_OBJECTS = \ ++@USE_GTK_TRUE@ gtk-window-decorator.$(OBJEXT) ++gtk_window_decorator_OBJECTS = $(am_gtk_window_decorator_OBJECTS) ++@USE_GTK_FALSE@@USE_METACITY_TRUE@gtk_window_decorator_DEPENDENCIES = ++@USE_GTK_FALSE@@USE_METACITY_FALSE@gtk_window_decorator_DEPENDENCIES = ++gtk_window_decorator_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/config/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtk-window-decorator.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(am__gtk_window_decorator_SOURCES_DIST) ++DATA = $(schema_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO gwd.schemas.in ++SOURCES = $(gtk_window_decorator_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/window-decorator/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/window-decorator/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-gwd.schemas: $(top_builddir)/config.status $(srcdir)/gwd.schemas.in ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++gwd.schemas: $(top_builddir)/config.status gwd.schemas.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + else :; fi; \ + done + +@@ -342,8 +312,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ++ rm -f $(DESTDIR)$(bindir)/$$f; \ + done + + clean-binPROGRAMS: +@@ -357,7 +327,7 @@ + $(LINK) $(gtk_window_decorator_LDFLAGS) $(gtk_window_decorator_OBJECTS) $(gtk_window_decorator_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -365,25 +335,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-window-decorator.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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -394,24 +376,33 @@ + distclean-libtool: + -rm -f libtool + uninstall-info-am: ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -420,7 +411,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -432,11 +422,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -459,6 +448,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -472,7 +465,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -490,10 +483,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(PROGRAMS) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(schemadir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(schemadir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -513,12 +505,11 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +-@USE_GCONF_FALSE@install-data-local: + clean: clean-am + + clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +@@ -533,8 +524,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -573,15 +562,15 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am \ +- install-data-local install-exec install-exec-am install-info \ +- install-info-am install-man install-schemaDATA install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-info-am uninstall-schemaDATA ++ dvi-am info info-am install install-am install-binPROGRAMS \ ++ install-data install-data-am install-data-local install-exec \ ++ install-exec-am install-info install-info-am install-man \ ++ install-schemaDATA install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-binPROGRAMS uninstall-info-am \ ++ uninstall-schemaDATA + + + @USE_GCONF_TRUE@install-data-local: +--- compiz-0.3.6.orig/images/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/images/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -21,6 +21,7 @@ + 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 +@@ -34,29 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = images +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(imagesdir)" +-imagesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(images_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -204,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -232,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -250,42 +226,28 @@ + icon.png \ + freedesktop.png + ++ + EXTRA_DIST = \ + icon.png \ + freedesktop.png + ++subdir = images ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(images_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu images/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -296,22 +258,23 @@ + distclean-libtool: + -rm -f libtool + uninstall-info-am: ++imagesDATA_INSTALL = $(INSTALL_DATA) + install-imagesDATA: $(images_DATA) + @$(NORMAL_INSTALL) +- test -z "$(imagesdir)" || $(mkdir_p) "$(DESTDIR)$(imagesdir)" ++ $(mkinstalldirs) $(DESTDIR)$(imagesdir) + @list='$(images_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$f'"; \ +- $(imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f"; \ ++ $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f; \ + done + + uninstall-imagesDATA: + @$(NORMAL_UNINSTALL) + @list='$(images_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(imagesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(imagesdir)/$$f"; \ ++ rm -f $(DESTDIR)$(imagesdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -319,6 +282,10 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -332,7 +299,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -350,10 +317,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(imagesdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(imagesdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -373,7 +339,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -390,8 +356,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -426,13 +390,13 @@ + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-imagesDATA install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-imagesDATA uninstall-info-am ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-imagesDATA \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-imagesDATA uninstall-info-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. +--- compiz-0.3.6.orig/include/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/include/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -21,6 +21,7 @@ + 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 +@@ -34,32 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = include +-DIST_COMMON = $(compizinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(compizincludedir)" +-compizincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(compizinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -207,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -235,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -253,38 +226,24 @@ + compiz.h \ + decoration.h + ++subdir = include ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++HEADERS = $(compizinclude_HEADERS) ++ ++DIST_COMMON = $(compizinclude_HEADERS) $(srcdir)/Makefile.in \ ++ Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu include/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -295,24 +254,33 @@ + distclean-libtool: + -rm -f libtool + uninstall-info-am: ++compizincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-compizincludeHEADERS: $(compizinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(compizincludedir)" || $(mkdir_p) "$(DESTDIR)$(compizincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(compizincludedir) + @list='$(compizinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(compizincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(compizincludedir)/$$f'"; \ +- $(compizincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(compizincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(compizincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(compizincludedir)/$$f"; \ ++ $(compizincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(compizincludedir)/$$f; \ + done + + uninstall-compizincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(compizinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(compizincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(compizincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(compizincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(compizincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -321,7 +289,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -333,11 +300,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -360,6 +326,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -373,7 +343,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -391,10 +361,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(compizincludedir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(compizincludedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -414,7 +383,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -432,8 +401,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -468,15 +435,14 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am \ +- install-compizincludeHEADERS install-data install-data-am \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am tags uninstall uninstall-am \ +- uninstall-compizincludeHEADERS uninstall-info-am ++ distclean-libtool distclean-tags distdir dvi dvi-am info \ ++ info-am install install-am install-compizincludeHEADERS \ ++ install-data install-data-am install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-compizincludeHEADERS uninstall-info-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. +--- compiz-0.3.6.orig/kde/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/kde/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,6 +13,7 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -20,6 +21,7 @@ + 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 +@@ -33,29 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = kde +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -203,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -231,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -245,38 +222,28 @@ + windowsettingsdatadir = @windowsettingsdatadir@ + windowsettingslibdir = @windowsettingslibdir@ + SUBDIRS = window-decorator ++subdir = kde ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kde/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu kde/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -295,13 +262,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -313,7 +274,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -321,13 +282,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -348,7 +303,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -359,6 +314,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -367,22 +330,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -392,11 +352,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -419,6 +378,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -432,7 +395,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -447,17 +410,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -467,6 +428,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -486,7 +448,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -504,8 +466,6 @@ + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: +@@ -540,18 +500,22 @@ + + uninstall-info: uninstall-info-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ +- 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-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ distclean-recursive distclean-tags distdir dvi dvi-am \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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. +--- compiz-0.3.6.orig/kde/window-decorator/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/kde/window-decorator/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -21,6 +21,7 @@ + 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 +@@ -34,58 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-@USE_KDE_TRUE@bin_PROGRAMS = $(am__EXEEXT_1) +-subdir = kde/window-decorator +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-@USE_KDE_TRUE@am__EXEEXT_1 = kde-window-decorator$(EXEEXT) +-am__installdirs = "$(DESTDIR)$(bindir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(bin_PROGRAMS) +-am__kde_window_decorator_SOURCES_DIST = decorator.moc.cpp \ +- window.moc.cpp KWinInterface_skel.cpp main.cpp utils.cpp \ +- utils.h decorator.cpp decorator.h window.cpp window.h \ +- options.cpp options.h KWinInterface.h +-@USE_KDE_TRUE@am__objects_1 = decorator.moc.$(OBJEXT) \ +-@USE_KDE_TRUE@ window.moc.$(OBJEXT) \ +-@USE_KDE_TRUE@ KWinInterface_skel.$(OBJEXT) +-@USE_KDE_TRUE@am_kde_window_decorator_OBJECTS = $(am__objects_1) \ +-@USE_KDE_TRUE@ main.$(OBJEXT) utils.$(OBJEXT) \ +-@USE_KDE_TRUE@ decorator.$(OBJEXT) window.$(OBJEXT) \ +-@USE_KDE_TRUE@ options.$(OBJEXT) +-kde_window_decorator_OBJECTS = $(am_kde_window_decorator_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/config/depcomp +-am__depfiles_maybe = depfiles +-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) +-CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(kde_window_decorator_SOURCES) +-DIST_SOURCES = $(am__kde_window_decorator_SOURCES_DIST) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -233,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -261,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -274,11 +221,13 @@ + target_alias = @target_alias@ + windowsettingsdatadir = @windowsettingsdatadir@ + windowsettingslibdir = @windowsettingslibdir@ ++ + @USE_KDE_TRUE@BUILDSOURCES = \ + @USE_KDE_TRUE@ decorator.moc.cpp \ + @USE_KDE_TRUE@ window.moc.cpp \ + @USE_KDE_TRUE@ KWinInterface_skel.cpp + ++ + @USE_KDE_TRUE@kde_window_decorator_DEPENDENCIES = \ + @USE_KDE_TRUE@ $(top_builddir)/libdecoration/libdecoration.la + +@@ -299,54 +248,86 @@ + @USE_KDE_TRUE@ options.h \ + @USE_KDE_TRUE@ KWinInterface.h + ++ + @USE_KDE_TRUE@kde_window_decorator_program = kde-window-decorator ++ + @USE_KDE_TRUE@INCLUDES = -I$(top_srcdir)/include @KDE_WINDOW_DECORATOR_CFLAGS@ @KDE_CFLAGS@ ++ ++@USE_KDE_TRUE@bin_PROGRAMS = $(kde_window_decorator_program) ++ + @USE_KDE_TRUE@CLEANFILES = $(BUILDSOURCES) KWinInterface_skel.* KWinInterface_stub.* + @USE_KDE_TRUE@EXTRA_DIST = $(BUILDSOURCES) ++subdir = kde/window-decorator ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++@USE_KDE_TRUE@bin_PROGRAMS = kde-window-decorator$(EXEEXT) ++@USE_KDE_FALSE@bin_PROGRAMS = ++PROGRAMS = $(bin_PROGRAMS) ++ ++am__kde_window_decorator_SOURCES_DIST = decorator.moc.cpp window.moc.cpp \ ++ KWinInterface_skel.cpp main.cpp utils.cpp utils.h decorator.cpp \ ++ decorator.h window.cpp window.h options.cpp options.h \ ++ KWinInterface.h ++@USE_KDE_TRUE@am__objects_1 = decorator.moc.$(OBJEXT) \ ++@USE_KDE_TRUE@ window.moc.$(OBJEXT) KWinInterface_skel.$(OBJEXT) ++@USE_KDE_TRUE@am_kde_window_decorator_OBJECTS = $(am__objects_1) \ ++@USE_KDE_TRUE@ main.$(OBJEXT) utils.$(OBJEXT) \ ++@USE_KDE_TRUE@ decorator.$(OBJEXT) window.$(OBJEXT) \ ++@USE_KDE_TRUE@ options.$(OBJEXT) ++kde_window_decorator_OBJECTS = $(am_kde_window_decorator_OBJECTS) ++@USE_KDE_FALSE@kde_window_decorator_DEPENDENCIES = ++kde_window_decorator_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/config/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/KWinInterface_skel.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/decorator.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/decorator.moc.Po ./$(DEPDIR)/main.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/options.Po ./$(DEPDIR)/utils.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/window.Po ./$(DEPDIR)/window.moc.Po ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(am__kde_window_decorator_SOURCES_DIST) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(kde_window_decorator_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .cpp .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kde/window-decorator/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu kde/window-decorator/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + else :; fi; \ + done + +@@ -354,8 +335,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ++ rm -f $(DESTDIR)$(bindir)/$$f; \ + done + + clean-binPROGRAMS: +@@ -369,7 +350,7 @@ + $(CXXLINK) $(kde_window_decorator_LDFLAGS) $(kde_window_decorator_OBJECTS) $(kde_window_decorator_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -384,25 +365,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.moc.Po@am__quote@ + + .cpp.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ++@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCXX_TRUE@ fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + .cpp.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ++@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCXX_TRUE@ fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .cpp.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ++@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCXX_TRUE@ fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -414,6 +407,14 @@ + -rm -f libtool + uninstall-info-am: + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -422,7 +423,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -434,11 +434,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -461,6 +460,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -474,7 +477,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -492,10 +495,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(PROGRAMS) ++ + installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -516,7 +518,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -535,8 +537,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -574,14 +574,14 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-binPROGRAMS uninstall-info-am ++ dvi-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-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-binPROGRAMS \ ++ uninstall-info-am + + + @USE_KDE_TRUE@%.moc.cpp: %.h +--- compiz-0.3.6.orig/libdecoration/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/libdecoration/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,7 +14,6 @@ + + @SET_MAKE@ + +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -22,6 +21,7 @@ + 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 +@@ -35,48 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = libdecoration +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/libdecoration.pc.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = libdecoration.pc +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(lib_LTLIBRARIES) +-libdecoration_la_LIBADD = +-am_libdecoration_la_OBJECTS = decoration.lo +-libdecoration_la_OBJECTS = $(am_libdecoration_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/config/depcomp +-am__depfiles_maybe = depfiles +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(libdecoration_la_SOURCES) +-DIST_SOURCES = $(libdecoration_la_SOURCES) +-pkgconfigDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(pkgconfig_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -224,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -252,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -266,71 +222,80 @@ + windowsettingsdatadir = @windowsettingsdatadir@ + windowsettingslibdir = @windowsettingslibdir@ + lib_LTLIBRARIES = libdecoration.la ++ + libdecoration_la_SOURCES = decoration.c + libdecoration_la_LDFLAGS = -no-undefined ++ + INCLUDES = -I$(top_srcdir)/include ++ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libdecoration.pc ++ + EXTRA_DIST = libdecoration.pc.in ++subdir = libdecoration ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = libdecoration.pc ++LTLIBRARIES = $(lib_LTLIBRARIES) ++ ++libdecoration_la_LIBADD = ++am_libdecoration_la_OBJECTS = decoration.lo ++libdecoration_la_OBJECTS = $(am_libdecoration_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/config/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/decoration.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libdecoration_la_SOURCES) ++DATA = $(pkgconfig_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am libdecoration.pc.in ++SOURCES = $(libdecoration_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libdecoration/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu libdecoration/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-libdecoration.pc: $(top_builddir)/config.status $(srcdir)/libdecoration.pc.in ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++libdecoration.pc: $(top_builddir)/config.status libdecoration.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ++libLTLIBRARIES_INSTALL = $(INSTALL) + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +@@ -338,7 +303,7 @@ + $(LINK) -rpath $(libdir) $(libdecoration_la_LDFLAGS) $(libdecoration_la_OBJECTS) $(libdecoration_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -346,25 +311,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decoration.Plo@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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -375,24 +352,33 @@ + distclean-libtool: + -rm -f libtool + uninstall-info-am: ++pkgconfigDATA_INSTALL = $(INSTALL_DATA) + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -401,7 +387,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -413,11 +398,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -440,6 +424,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -453,7 +441,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -471,10 +459,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -494,7 +481,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -514,8 +501,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -554,16 +539,15 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pkgconfigDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am uninstall-libLTLIBRARIES \ +- uninstall-pkgconfigDATA ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-libLTLIBRARIES uninstall-pkgconfigDATA + + # 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. +--- compiz-0.3.6.orig/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/Makefile.in 2007-02-20 23:33:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -21,6 +21,7 @@ + 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 +@@ -34,55 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/compiz.pc.in \ +- $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ +- ChangeLog INSTALL NEWS TODO config/config.guess \ +- config/config.sub config/depcomp config/install-sh \ +- config/ltmain.sh config/missing config/mkinstalldirs +-subdir = . +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(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 +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = compiz.pc +-SOURCES = +-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 +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +-pkgconfigDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(pkgconfig_DATA) +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +-am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } +-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -230,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -258,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -272,50 +222,55 @@ + windowsettingsdatadir = @windowsettingsdatadir@ + windowsettingslibdir = @windowsettingslibdir@ + SUBDIRS = include src libdecoration plugins images gtk kde po ++ + EXTRA_DIST = \ + COPYING \ + COPYING.GPL \ + COPYING.MIT \ + compiz.pc.in + ++ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = compiz.pc ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = compiz.pc ++DIST_SOURCES = ++DATA = $(pkgconfig_DATA) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ ++ COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \ ++ compiz.pc.in config.h.in config/config.guess config/config.sub \ ++ config/depcomp config/install-sh config/ltmain.sh \ ++ config/missing config/mkinstalldirs configure configure.ac ++DIST_SUBDIRS = $(SUBDIRS) + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-am--refresh: +- @: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ +- cd $(srcdir) && $(AUTOMAKE) --gnu \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- echo ' $(SHELL) ./config.status'; \ +- $(SHELL) ./config.status;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ +- esac; ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 +@@ -327,14 +282,14 @@ + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOHEADER) +- rm -f stamp-h1 +- touch $@ ++ touch $(srcdir)/config.h.in + + distclean-hdr: + -rm -f config.h stamp-h1 +-compiz.pc: $(top_builddir)/config.status $(srcdir)/compiz.pc.in ++compiz.pc: $(top_builddir)/config.status compiz.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + + mostlyclean-libtool: +@@ -346,22 +301,23 @@ + distclean-libtool: + -rm -f libtool + uninstall-info-am: ++pkgconfigDATA_INSTALL = $(INSTALL_DATA) + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -371,13 +327,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -389,7 +339,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -397,13 +347,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -424,7 +368,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -435,6 +379,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -443,22 +395,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + 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 \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -468,11 +417,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -495,11 +443,24 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = . ++distdir = $(PACKAGE)-$(VERSION) ++ ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++ ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print + + distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) +- $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/gtk/gnome $(distdir)/gtk/window-decorator $(distdir)/libdecoration $(distdir)/plugins $(distdir)/po ++ $(mkinstalldirs) $(distdir)/. $(distdir)/config $(distdir)/gtk/gnome $(distdir)/gtk/window-decorator $(distdir)/libdecoration $(distdir)/plugins $(distdir)/po + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +@@ -511,7 +472,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -526,17 +487,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -547,46 +506,24 @@ + ! -type d ! -perm -444 -exec $(SHELL) $(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 +- $(am__remove_distdir) +-dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +-dist-tarZ: distdir +- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) +- +-dist-shar: distdir +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) +- +-dist-zip: distdir +- -rm -f $(distdir).zip +- zip -rq $(distdir).zip $(distdir) ++dist-bzip2: distdir ++ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + + dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another + # tarfile. + distcheck: dist +- case '$(DIST_ARCHIVES)' in \ +- *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ +- *.zip*) \ +- unzip $(distdir).zip ;;\ +- esac ++ $(am__remove_distdir) ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst +@@ -606,20 +543,19 @@ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ +- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist \ +- && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ++ && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(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;}' ++ @echo "$(distdir).tar.gz is ready for distribution" | \ ++ sed 'h;s/./=/g;p;x;p;x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -643,9 +579,8 @@ + all-am: Makefile $(DATA) config.h + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -665,7 +600,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -677,15 +612,13 @@ + distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-hdr \ +- distclean-libtool distclean-tags ++distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: +@@ -722,22 +655,25 @@ + + uninstall-info: uninstall-info-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ +- check-am clean clean-generic clean-libtool 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-libtool \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-recursive ctags \ ++ ctags-recursive dist dist-all dist-bzip2 dist-gzip distcheck \ ++ distclean distclean-generic distclean-hdr distclean-libtool \ + 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-pkgconfigDATA install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ ++ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ ++ info-recursive install install-am install-data install-data-am \ ++ install-data-recursive install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-pkgconfigDATA \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ +- uninstall-pkgconfigDATA ++ uninstall-info-recursive uninstall-pkgconfigDATA \ ++ uninstall-recursive + + # 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. +--- compiz-0.3.6.orig/po/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ compiz-0.3.6/po/Makefile.in 2007-02-20 23:33:34.000000000 +0100 +@@ -0,0 +1,270 @@ ++# Makefile for program source directory in GNU NLS utilities package. ++# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper ++# ++# This file file be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. ++# Please note that the actual code is *not* freely available. ++# ++# - Modified by Owen Taylor to use GETTEXT_PACKAGE ++# instead of PACKAGE and to look for po2tbl in ./ not in intl/ ++# ++# - Modified by jacob berkman to install ++# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize ++ ++GETTEXT_PACKAGE = compiz ++PACKAGE = compiz ++VERSION = 0.3.6 ++ ++SHELL = /bin/sh ++ ++ ++srcdir = . ++top_srcdir = .. ++ ++ ++prefix = /usr/local ++exec_prefix = ${prefix} ++datarootdir = ${prefix}/share ++datadir = ${datarootdir} ++libdir = ${exec_prefix}/lib ++localedir = $(libdir)/locale ++gnulocaledir = $(datadir)/locale ++gettextsrcdir = $(datadir)/glib-2.0/gettext/po ++subdir = po ++ ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++MKINSTALLDIRS = $(top_srcdir)/config/mkinstalldirs ++ ++CC = gcc ++GENCAT = @GENCAT@ ++GMSGFMT = /usr/bin/msgfmt ++MSGFMT = /usr/bin/msgfmt ++XGETTEXT = /usr/bin/xgettext ++MSGMERGE = msgmerge ++ ++DEFS = -DHAVE_CONFIG_H ++CFLAGS = -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing ++CPPFLAGS = ++ ++INCLUDES = -I.. -I$(top_srcdir)/intl ++ ++COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) ++ ++SOURCES = ++POFILES = cs.po de.po es.po fi.po fr.po hu.po it.po ja.po pl.po pt_BR.po sv.po zh_CN.po zh_TW.po ++GMOFILES = cs.gmo de.gmo es.gmo fi.gmo fr.gmo hu.gmo it.gmo ja.gmo pl.gmo pt_BR.gmo sv.gmo zh_CN.gmo zh_TW.gmo ++DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ ++$(POFILES) $(GMOFILES) $(SOURCES) ++ ++POTFILES = \ ++ ++CATALOGS = cs.gmo de.gmo es.gmo fi.gmo fr.gmo hu.gmo it.gmo ja.gmo pl.gmo pt_BR.gmo sv.gmo zh_CN.gmo zh_TW.gmo ++CATOBJEXT = .gmo ++INSTOBJEXT = .mo ++ ++.SUFFIXES: ++.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat ++ ++.c.o: ++ $(COMPILE) $< ++ ++.po.pox: ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox ++ ++.po.mo: ++ $(MSGFMT) -o $@ $< ++ ++.po.gmo: ++ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ ++ && rm -f $$file && $(GMSGFMT) -c -o $$file $< ++ ++.po.cat: ++ sed -f ../intl/po2msg.sed < $< > $*.msg \ ++ && rm -f $@ && $(GENCAT) $@ $*.msg ++ ++ ++all: all-yes ++ ++all-yes: $(CATALOGS) ++all-no: ++ ++$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) ++ $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ ++ --add-comments --keyword=_ --keyword=N_ \ ++ --flag=g_strdup_printf:1:c-format \ ++ --flag=g_string_printf:2:c-format \ ++ --flag=g_string_append_printf:2:c-format \ ++ --flag=g_error_new:3:c-format \ ++ --flag=g_set_error:4:c-format \ ++ --flag=g_markup_printf_escaped:1:c-format \ ++ --flag=g_log:3:c-format \ ++ --flag=g_print:1:c-format \ ++ --flag=g_printerr:1:c-format \ ++ --flag=g_printf:1:c-format \ ++ --flag=g_fprintf:2:c-format \ ++ --flag=g_sprintf:2:c-format \ ++ --flag=g_snprintf:3:c-format \ ++ --flag=g_scanner_error:2:c-format \ ++ --flag=g_scanner_warn:2:c-format \ ++ --files-from=$(srcdir)/POTFILES.in \ ++ && test ! -f $(GETTEXT_PACKAGE).po \ ++ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ ++ && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) ++ ++install: install-exec install-data ++install-exec: ++install-data: install-data-yes ++install-data-no: all ++install-data-yes: all ++ if test -r "$(MKINSTALLDIRS)"; then \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ ++ else \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ ++ fi ++ @catalogs='$(CATALOGS)'; \ ++ for cat in $$catalogs; do \ ++ cat=`basename $$cat`; \ ++ case "$$cat" in \ ++ *.gmo) destdir=$(gnulocaledir);; \ ++ *) destdir=$(localedir);; \ ++ esac; \ ++ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ ++ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ ++ if test -r "$(MKINSTALLDIRS)"; then \ ++ $(MKINSTALLDIRS) $$dir; \ ++ else \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ ++ fi; \ ++ if test -r $$cat; then \ ++ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ ++ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ ++ else \ ++ $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ ++ echo "installing $(srcdir)/$$cat as" \ ++ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ ++ fi; \ ++ if test -r $$cat.m; then \ ++ $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ ++ echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ ++ else \ ++ if test -r $(srcdir)/$$cat.m ; then \ ++ $(INSTALL_DATA) $(srcdir)/$$cat.m \ ++ $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ ++ echo "installing $(srcdir)/$$cat as" \ ++ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ ++ else \ ++ true; \ ++ fi; \ ++ fi; \ ++ done ++ if test "$(PACKAGE)" = "glib"; then \ ++ if test -r "$(MKINSTALLDIRS)"; then \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ ++ else \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ ++ fi; \ ++ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ ++ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ ++ else \ ++ : ; \ ++ fi ++ ++# Define this as empty until I found a useful application. ++installcheck: ++ ++uninstall: ++ catalogs='$(CATALOGS)'; \ ++ for cat in $$catalogs; do \ ++ cat=`basename $$cat`; \ ++ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ ++ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ ++ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ ++ done ++ if test "$(PACKAGE)" = "glib"; then \ ++ rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ ++ fi ++ ++check: all ++ ++dvi info tags TAGS ID: ++ ++mostlyclean: ++ rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp ++ rm -fr *.o ++ ++clean: mostlyclean ++ ++distclean: clean ++ rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ rm -f $(GMOFILES) ++ ++distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: update-po $(DISTFILES) ++ dists="$(DISTFILES)"; \ ++ for file in $$dists; do \ ++ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ ++ || cp -p $(srcdir)/$$file $(distdir); \ ++ done ++ ++update-po: Makefile ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ tmpdir=`pwd`; \ ++ cd $(srcdir); \ ++ catalogs='$(CATALOGS)'; \ ++ for cat in $$catalogs; do \ ++ cat=`basename $$cat`; \ ++ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ ++ echo "$$lang:"; \ ++ if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \ ++ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "msgmerge for $$cat failed!"; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi; \ ++ done ++ ++# POTFILES is created from POTFILES.in by stripping comments, empty lines ++# and Intltool tags (enclosed in square brackets), and appending a full ++# relative path to them ++POTFILES: POTFILES.in ++ ( if test 'x$(srcdir)' != 'x.'; then \ ++ posrcprefix='$(top_srcdir)/'; \ ++ else \ ++ posrcprefix="../"; \ ++ fi; \ ++ rm -f $@-t $@ \ ++ && (sed -e '/^#/d' \ ++ -e "s/^\[.*\] +//" \ ++ -e '/^[ ]*$$/d' \ ++ -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ ++ | sed -e '$$s/\\$$//') > $@-t \ ++ && chmod a-w $@-t \ ++ && mv $@-t $@ ) ++ ++Makefile: Makefile.in.in ../config.status POTFILES ++ cd .. \ ++ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ ++ $(SHELL) ./config.status ++ ++# Tell versions [3.59,3.63) of GNU make not to export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +--- compiz-0.3.6.orig/src/Makefile.in 2007-02-20 23:32:54.000000000 +0100 ++++ compiz-0.3.6/src/Makefile.in 2007-02-20 23:33:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -21,6 +21,7 @@ + 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 +@@ -34,43 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = compiz$(EXEEXT) +-subdir = src +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(bin_PROGRAMS) +-am_compiz_OBJECTS = main.$(OBJEXT) privates.$(OBJEXT) \ +- texture.$(OBJEXT) display.$(OBJEXT) screen.$(OBJEXT) \ +- window.$(OBJEXT) event.$(OBJEXT) paint.$(OBJEXT) \ +- option.$(OBJEXT) plugin.$(OBJEXT) session.$(OBJEXT) +-compiz_OBJECTS = $(am_compiz_OBJECTS) +-compiz_DEPENDENCIES = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/config/depcomp +-am__depfiles_maybe = depfiles +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(compiz_SOURCES) +-DIST_SOURCES = $(compiz_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -218,8 +183,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -246,7 +209,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -266,6 +228,9 @@ + -DPLUGINDIR=\"$(plugindir)\" \ + -DIMAGEDIR=\"$(imagedir)\" + ++ ++bin_PROGRAMS = compiz ++ + compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm + compiz_LDFLAGS = -export-dynamic + compiz_SOURCES = \ +@@ -281,50 +246,62 @@ + plugin.c \ + session.c + ++subdir = src ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++bin_PROGRAMS = compiz$(EXEEXT) ++PROGRAMS = $(bin_PROGRAMS) ++ ++am_compiz_OBJECTS = main.$(OBJEXT) privates.$(OBJEXT) texture.$(OBJEXT) \ ++ display.$(OBJEXT) screen.$(OBJEXT) window.$(OBJEXT) \ ++ event.$(OBJEXT) paint.$(OBJEXT) option.$(OBJEXT) \ ++ plugin.$(OBJEXT) session.$(OBJEXT) ++compiz_OBJECTS = $(am_compiz_OBJECTS) ++compiz_DEPENDENCIES = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/config/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/display.Po ./$(DEPDIR)/event.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/option.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/paint.Po ./$(DEPDIR)/plugin.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/privates.Po ./$(DEPDIR)/screen.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/session.Po ./$(DEPDIR)/texture.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/window.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(compiz_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(compiz_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + else :; fi; \ + done + +@@ -332,8 +309,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ++ rm -f $(DESTDIR)$(bindir)/$$f; \ + done + + clean-binPROGRAMS: +@@ -347,7 +324,7 @@ + $(LINK) $(compiz_LDFLAGS) $(compiz_OBJECTS) $(compiz_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -365,25 +342,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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@ 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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@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@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -395,6 +384,14 @@ + -rm -f libtool + uninstall-info-am: + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -403,7 +400,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -415,11 +411,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { 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) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -442,6 +437,10 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -455,7 +454,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -473,10 +472,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(PROGRAMS) ++ + installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -496,7 +494,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -515,8 +513,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -554,14 +550,14 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-binPROGRAMS uninstall-info-am ++ dvi-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-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-binPROGRAMS \ ++ uninstall-info-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. only in patch2: unchanged: --- compiz-0.3.6.orig/debian/patches/11-fix-mouse-move-key.patch +++ compiz-0.3.6/debian/patches/11-fix-mouse-move-key.patch @@ -0,0 +1,19 @@ +commit 74a562a8c0090db82b93a1c30437c0ab83a251ef +Author: Nicolas Bruguier +Date: Mon Feb 19 23:48:07 2007 +0100 + + Fix gconf mouse move key + +diff --git a/gtk/gnome/compiz-window-manager.c b/gtk/gnome/compiz-window-manager.c +index 1ef8804..c8011fb 100644 +--- a/gtk/gnome/compiz-window-manager.c ++++ b/gtk/gnome/compiz-window-manager.c +@@ -41,7 +41,7 @@ + "/apps/compiz/general/allscreens/options/autoraise_delay" + + #define COMPIZ_MOUSE_MOVE_KEY \ +- "/apps/compiz/plugins/move/screen0/options/initiate" ++ "/apps/compiz/plugins/move/allscreens/options/initiate_button" + + #define GCONF_DIR "/apps/metacity/general" +