Merge lp:~noskcaj/ubuntu/trusty/gtk2-engines/merge into lp:ubuntu/trusty/gtk2-engines

[Jackson Doak]

Merge from debian, they fixed the automake FTBFS better than we did.

[Jackson Doak (noskcaj)]

The last lines of the bzr commit was from debcommit.

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

74. By Jackson Doak on 2013-12-15

* Merge from debian, remaining changes:
  - debian/control: Build depend on gnome-common, so we can get a .pot file
    to use for launchpad translations
  - debian/rules: build translations template
  - Update watch file to only track GNOME 2.20 as gtk-engines was then
    ported to gtk3 and finally abandoned.
* Drop our automake fix, debian now supports the new version
* Fix FTBS due to automake bug (Closes: #713353)

73. By Jackson Doak on 2013-12-15

Merging shared upstream rev into target branch.

=== removed directory '.pc/01_libm.patch'
=== removed directory '.pc/01_libm.patch/engines'
=== removed directory '.pc/01_libm.patch/engines/clearlooks'
=== removed file '.pc/01_libm.patch/engines/clearlooks/Makefile.am'
--- .pc/01_libm.patch/engines/clearlooks/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/clearlooks/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# Clearlooks - a cairo based GTKengine
-# Copyright (C) 2005-2006 Andrew Johnson <[e-mail]>
-# Copyright (C) 2006-2007 Benjamin Berg <[e-mail]>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Project contact: <[e-mail]>
-#
-
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-engine_LTLIBRARIES = libclearlooks.la
-
-libclearlooks_la_SOURCES =		\
-	./src/clearlooks_rc_style.c	\
-	./src/clearlooks_rc_style.h	\
-	./src/clearlooks_style.c	\
-	./src/clearlooks_style.h	\
-	./src/clearlooks_theme_main.c	\
-	./src/support.c			\
-	./src/animation.c		\
-	./src/animation.h		\
-	./src/support.h			\
-	./src/clearlooks_draw.c		\
-	./src/clearlooks_draw_glossy.c	\
-	./src/clearlooks_draw_inverted.c	\
-	./src/clearlooks_draw_gummy.c	\
-	./src/clearlooks_draw.h		\
-	./src/clearlooks_types.h
-
-libclearlooks_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libclearlooks_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/crux'
=== removed file '.pc/01_libm.patch/engines/crux/Makefile.am'
--- .pc/01_libm.patch/engines/crux/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/crux/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-
-engine_LTLIBRARIES = libcrux-engine.la
-
-EXTRA_DIST = \
-	./AUTHORS
-
-libcrux_engine_la_SOURCES = \
-	./src/crux.h                  \
-	./src/crux-draw.c             \
-	./src/crux-draw.h             \
-	./src/crux-main.c             \
-	./src/crux-style.c            \
-	./src/crux-style.h            \
-	./src/crux-rc-style.c            \
-	./src/crux-rc-style.h
-
-libcrux_engine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libcrux_engine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/glide'
=== removed file '.pc/01_libm.patch/engines/glide/Makefile.am'
--- .pc/01_libm.patch/engines/glide/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/glide/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# Glide - a cairo based GTK+ engine
-# Copyright (C) 2006 Andrew Johnson <[e-mail]>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public   
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of 
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Project contact: <[e-mail]>
-#
-
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS)  $(DEVELOPMENT_CFLAGS)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-
-engine_LTLIBRARIES = libglide.la
-
-libglide_la_SOURCES = \
-	./src/glide_gtk2_support.c	\
-	./src/glide_gtk2_support.h	\
-	./src/glide_gtk2_drawing.c	\
-	./src/glide_gtk2_drawing.h	\
-	./src/glide_gtk2_engine.c	\
-	./src/glide_gtk2_engine.h
-
-libglide_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libglide_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/hc'
=== removed file '.pc/01_libm.patch/engines/hc/Makefile.am'
--- .pc/01_libm.patch/engines/hc/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/hc/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-# High Contrast - a cairo based GTK+ engine
-# Copyright (C) 2003 Sun Microsystems Inc.
-# Copyright (C) 2005-2006 Andrew Johnson <[e-mail]>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Project contact: <[e-mail]>
-#
-
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-
-engine_LTLIBRARIES = libhcengine.la
-
-EXTRA_DIST = \
-	./AUTHORS
-
-libhcengine_la_SOURCES = \
-	./src/hc_gtk2_engine.c	\
-	./src/hc_gtk2_engine.h	\
-        ./src/hc_gtk2_support.c  \
-        ./src/hc_gtk2_support.h  \
-        ./src/hc_gtk2_drawing.h  \
-	./src/hc-style.c
-
-libhcengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/industrial'
=== removed file '.pc/01_libm.patch/engines/industrial/Makefile.am'
--- .pc/01_libm.patch/engines/industrial/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/industrial/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# Clearlooks - a cairo based GTKengine
-# Copyright (C) 2001 Red Hat, Inc.
-# Copyright (C) 2002 Ximian, Inc.
-# Copyright (C) 2006 Benjamin Berg <[e-mail]>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Project contact: <[e-mail]>
-#
-
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-
-engine_LTLIBRARIES = libindustrial.la
-
-libindustrial_la_SOURCES = \
-	./src/industrial_rc_style.c	\
-	./src/industrial_rc_style.h	\
-	./src/industrial_style.c	\
-	./src/industrial_style.h	\
-	./src/industrial_theme_main.c
-
-EXTRA_DIST = \
-	./src/parse_rc_style.h				\
-	./AUTHORS
-
-libindustrial_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libindustrial_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/lua'
=== removed file '.pc/01_libm.patch/engines/lua/Makefile.am'
--- .pc/01_libm.patch/engines/lua/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/lua/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-# LUA - a LUA scriptable GTK+ engine
-# Copyright (C) 2006 Daniel Borgmann <[e-mail]>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Project contact: <[e-mail]>
-#
-
-
-NULL =
-
-LIBLUA_FILES = \
-	./src/liblua/lapi.h \
-	./src/liblua/lauxlib.h \
-	./src/liblua/lcode.h \
-	./src/liblua/ldebug.h \
-	./src/liblua/ldo.h \
-	./src/liblua/lfunc.h \
-	./src/liblua/lgc.h \
-	./src/liblua/llex.h \
-	./src/liblua/llimits.h \
-	./src/liblua/lmem.h \
-	./src/liblua/lobject.h \
-	./src/liblua/lopcodes.h \
-	./src/liblua/lparser.h \
-	./src/liblua/lstate.h \
-	./src/liblua/lstring.h \
-	./src/liblua/ltable.h \
-	./src/liblua/ltm.h \
-	./src/liblua/lua.h \
-	./src/liblua/luaconf.h \
-	./src/liblua/lualib.h \
-	./src/liblua/lundump.h \
-	./src/liblua/lvm.h \
-	./src/liblua/lzio.h \
-	./src/liblua/lapi.c \
-	./src/liblua/lcode.c \
-	./src/liblua/ldebug.c \
-	./src/liblua/ldo.c \
-	./src/liblua/ldump.c \
-	./src/liblua/lfunc.c \
-	./src/liblua/lgc.c \
-	./src/liblua/liolib.c \
-	./src/liblua/llex.c \
-	./src/liblua/lmem.c \
-	./src/liblua/lobject.c \
-	./src/liblua/lopcodes.c \
-	./src/liblua/loslib.c \
-	./src/liblua/lparser.c \
-	./src/liblua/lstate.c \
-	./src/liblua/lstring.c \
-	./src/liblua/lstrlib.c \
-	./src/liblua/ltable.c \
-	./src/liblua/ltablib.c \
-	./src/liblua/ltm.c \
-	./src/liblua/lundump.c \
-	./src/liblua/lvm.c \
-	./src/liblua/lzio.c \
-	./src/liblua/lauxlib.c \
-	./src/liblua/lbaselib.c \
-	./src/liblua/ldblib.c \
-	./src/liblua/lmathlib.c \
-	./src/liblua/loadlib.c \
-	./src/liblua/linit.c
-
-if SYSTEM_LUA
-LIBLUA_SOURCES =
-LIBLUA_CFLAGS = $(LUA_CFLAGS)
-EXTRA_DIST = $(LIBLUA_FILES)
-else
-LIBLUA_CFLAGS = -I$(top_srcdir)/engines/lua/src/liblua
-LIBLUA_SOURCES = $(LIBLUA_FILES)
-EXTRA_DIST = 
-endif
-
-INCLUDES = \
-	-I$(top_srcdir)/engines/support \
-	$(LIBLUA_CFLAGS) $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \
-	$(NULL)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-engine_LTLIBRARIES = libluaengine.la
-
-libluaengine_la_SOURCES = \
-	./src/draw_lib.c \
-	./src/draw_lib.h \
-	./src/draw_utils.c \
-	./src/draw_utils.h \
-	./src/lua_rc_style.c \
-	./src/lua_rc_style.h \
-	./src/lua_style.c \
-	./src/lua_style.h \
-	./src/lua_utils.c \
-	./src/lua_utils.h \
-	./src/main.c \
-	./src/misc_utils.c \
-	./src/misc_utils.h \
-	$(LIBLUA_SOURCES) \
-	$(NULL)
-
-libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/mist'
=== removed file '.pc/01_libm.patch/engines/mist/Makefile.am'
--- .pc/01_libm.patch/engines/mist/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/mist/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-
-engine_LTLIBRARIES = libmist.la
-
-EXTRA_DIST = \
-	./AUTHORS
-
-libmist_la_SOURCES = \
-	./src/mist-rc-style.c	\
-	./src/mist-rc-style.h	\
-	./src/mist-style.c	\
-	./src/mist-style.h	\
-	./src/mist.c
-
-libmist_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/redmond'
=== removed file '.pc/01_libm.patch/engines/redmond/Makefile.am'
--- .pc/01_libm.patch/engines/redmond/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/redmond/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-# Redmond95 - a cairo based GTK+ engine
-# Copyright (C) 2001 Red Hat, Inc.
-# Copyright (C) 2006 Andrew Johnson <[e-mail]>  
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,  
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Project contact: <[e-mail]>
-#
-
-
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
-
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-
-engine_LTLIBRARIES = libredmond95.la
-
-libredmond95_la_SOURCES = \
-	./src/redmond_gtk2_misc.c	\
-	./src/redmond_gtk2_misc.h	\
-	./src/redmond_gtk2_drawing.c	\
-	./src/redmond_gtk2_drawing.h	\
-	./src/redmond_gtk2_engine.c	\
-	./src/redmond_gtk2_engine.h
-
-libredmond95_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libredmond95_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/engines/thinice'
=== removed file '.pc/01_libm.patch/engines/thinice/Makefile.am'
--- .pc/01_libm.patch/engines/thinice/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/engines/thinice/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-INCLUDES = -I$(top_srcdir)/engines/support \
-           $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
-
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-
-engine_LTLIBRARIES = libthinice.la
-
-EXTRA_DIST = \
-	./AUTHORS
-
-libthinice_la_SOURCES = \
-	./src/thinice_rc_style.c	\
-	./src/thinice_rc_style.h	\
-	./src/thinice_style.h		\
-	./src/thinice_misc.h		\
-	./src/thinice_misc.c		\
-	./src/thinice_theme_draw.c	\
-	./src/thinice_main.c
-
-libthinice_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/01_libm.patch/test'
=== removed file '.pc/01_libm.patch/test/Makefile.am'
--- .pc/01_libm.patch/test/Makefile.am	2011-11-13 18:42:27 +0000
+++ .pc/01_libm.patch/test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-# gtk-engines - a collection of drawing engines for GTK+ 
-# Copyright (C) 2007 Benjamin Berg <[e-mail]>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Project contact: <[e-mail]>
-#
-
-
-# Initilize TESTS and XFAIL_TESTS
-TESTS =
-XFAIL_TESTS =
-
-GTKRCS =				\
-	gtkrcs/buildin			\
-	gtkrcs/clearlooks		\
-	gtkrcs/clearlooks-glossy	\
-	gtkrcs/clearlooks-inverted	\
-	gtkrcs/clearlooks-gummy		\
-	gtkrcs/crux			\
-	gtkrcs/glide			\
-	gtkrcs/hc			\
-	gtkrcs/industrial		\
-	gtkrcs/mist			\
-	gtkrcs/redmond			\
-	gtkrcs/thinice
-
-EXTRA_DIST = exported torture runinx valgrind-suppressions $(GTKRCS)
-
-
-EXTRA_PROGRAMS = torturetest
-torturetest_CFLAGS = $(GTK_CFLAGS)
-torturetest_LDFLAGS = $(GTK_LIBS)
-
-
-
-# Setup enviroment variables for GTK+
-# ie. add $(top_builddir)/tests to the module searchpath, so that GTK+ finds
-# the engines in tests/engines
-# Also set the debug-blocks debugging of g_slice, will be overridden during the valgrind test.
-# Unset GTK_MODULES to not load a11y stuff or similar.
-TESTS_ENVIRONMENT=GTK_PATH="." G_SLICE=debug-blocks GTK_MODULES=""
-
-VALGRIND_COMMAND=valgrind --leak-resolution=high --leak-check=full --suppressions=$(srcdir)/valgrind-suppressions --num-callers=20 --log-file=valgrind-logs/THEME
-# set some flags to make glib more valgrind friendly
-VALGRIND_ENV=G_SLICE=always-malloc G_DEBUG=gc-friendly,resident-modules
-
-#################################################################
-#################################################################
-
-#############################################################
-# Exported Symbols Test - Tests all engines unconditionally
-#############################################################
-# Prefix with exported_
-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
-
-TESTS += $(EXPORTED_SYMBOLS_TESTS)
-
-
-#############################################################
-# Torture Test
-#############################################################
-SUPPORTED_TORTURE_TEST_ENGINES = \
-	clearlooks	\
-	crux		\
-	glide		\
-	hc		\
-	industrial	\
-	mist		\
-	redmond		\
-	thinice
-
-# Filter engines that are not build from the set of engines
-TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
-# Prefix with torture_
-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
-
-# Add TORTURE_TEST_ENGINES to list of tests
-TESTS += $(TORTURE_TEST_TESTS)
-
-# Possible other tests:
-#  - An extensive theme switch tests that loads/unloads the engine
-#    multiple times. A requirement here is that multiple rc styles need
-#    to be merged.
-#  - RC style merging? Don't think there is a way to do that.
-#  - Maybe a visual test that looks for visible changes? That way one can
-#    check that a modification does not break anything. (eg. when doing
-#    code cleanups)
-#  - I would love to have some coverage statistics for the torture test
-#    anyone knows how to do that?
-
-#################################################################
-#################################################################
-
-engines:
-	-rm -rf engines
-	mkdir engines
-	cd engines; \
-	for engine in $(BUILD_ENGINES); do \
-		# Fail if the engine does not exist. \
-		# Maybe we should force a build or something? \
-		if [ ! -f ../$(top_builddir)/engines/$$engine/.libs/*.so ]; then \
-			exit 1; \
-		fi; \
-		ln -s ../$(top_builddir)/engines/$$engine/.libs/*.so lib$$engine.so ; \
-	done;
-
-CLEANFILES = \
-	torture_buildin-failed \
-	$(EXTRA_PROGRAMS)
-
-clean-local:
-	-$(RM) torture_*
-	-$(RM) exported_*
-	-$(RM) -r engines
-	-$(RM) -r valgrind-logs
-	-$(RM) -r symbols
-
-valgrind-logs:
-	-$(RM) -r valgrind-logs
-	mkdir valgrind-logs
-
-symbols:
-	mkdir symbols
-
-torture_%: torture torturetest engines
-	cp $(srcdir)/torture $@
-
-exported_%: exported engines symbols
-	cp $(srcdir)/exported $@
-
-check-valgrind: valgrind-logs
-	$(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(VALGRIND_ENV) EXEC_WRAPPER=\"$(VALGRIND_COMMAND)\""
-
-test:
-	@$(MAKE) $(AM_MAKEFLAGS) check
-
-.PHONY: engines valgrind-logs
-
--include $(top_srcdir)/git.mk
-
 
=== removed directory '.pc/02_glib-single-include.patch'
=== removed directory '.pc/02_glib-single-include.patch/engines'
=== removed directory '.pc/02_glib-single-include.patch/engines/clearlooks'
=== removed directory '.pc/02_glib-single-include.patch/engines/clearlooks/src'
=== removed file '.pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c'
--- .pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c	2012-03-25 23:51:08 +0000
+++ .pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c	1970-01-01 00:00:00 +0000
@@ -1,341 +0,0 @@
-/* Clearlooks - a cairo based GTK+ engine
- * Copyright (C) 2006 Kulyk Nazar <[e-mail]>
- * Copyright (C) 2006-2007 Benjamin Berg <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Project contact: <[e-mail]>
- *
- *
- * This code is responsible for the clearlooks animation support. The code
- * works by forcing a redraw on the animated widget.
- *
- */
- 
-
-#include "animation.h"
-
-#ifdef HAVE_WORKING_ANIMATION
-#include <glib/gtimer.h>
-
-struct _AnimationInfo {
-	GTimer *timer;
-	
-	gdouble start_modifier;
-	gdouble stop_time;
-	GtkWidget *widget;
-};
-typedef struct _AnimationInfo AnimationInfo;
-
-struct _SignalInfo {
-	GtkWidget *widget;
-	gulong handler_id;
-};
-typedef struct _SignalInfo SignalInfo;
-
-static GSList     *connected_widgets  = NULL;
-static GHashTable *animated_widgets   = NULL;
-static int         animation_timer_id = 0;
-
-
-static gboolean animation_timeout_handler (gpointer data);
-
-/* This forces a redraw on a widget */
-static void
-force_widget_redraw (GtkWidget *widget)
-{
-	if (GE_IS_PROGRESS_BAR (widget))
-		gtk_widget_queue_resize (widget);
-	else
-		gtk_widget_queue_draw (widget);
-}
-
-/* ensures that the timer is running */
-static void
-start_timer ()
-{
-	if (animation_timer_id == 0)
-		animation_timer_id = g_timeout_add (ANIMATION_DELAY, animation_timeout_handler, NULL);
-}
-
-/* ensures that the timer is stopped */
-static void
-stop_timer ()
-{
-	if (animation_timer_id != 0)
-	{
-		g_source_remove(animation_timer_id);
-		animation_timer_id = 0;
-	}
-}
-
-
-/* destroys an AnimationInfo structure including the GTimer */
-static void
-animation_info_destroy (AnimationInfo *animation_info)
-{
-	g_timer_destroy (animation_info->timer);
-	g_free (animation_info);
-}
-
-
-/* This function does not unref the weak reference, because the object
- * is beeing destroyed currently. */
-static void
-on_animated_widget_destruction (gpointer data, GObject *object)
-{
-	/* steal the animation info from the hash table (destroying it would
-	 * result in the weak reference to be unrefed, which does not work
-	 * as the widget is already destroyed. */
-	g_hash_table_steal (animated_widgets, object);
-	animation_info_destroy ((AnimationInfo*) data);
-}
-
-/* This function also needs to unref the weak reference. */
-static void
-destroy_animation_info_and_weak_unref (gpointer data)
-{
-	AnimationInfo *animation_info = data;
-	
-	/* force a last redraw. This is so that if the animation is removed,
-	 * the widget is left in a sane state. */
-	force_widget_redraw (animation_info->widget);
-	
-	g_object_weak_unref (G_OBJECT (animation_info->widget), on_animated_widget_destruction, data);
-	animation_info_destroy (animation_info);
-}
-
-/* Find and return a pointer to the data linked to this widget, if it exists */
-static AnimationInfo*
-lookup_animation_info (const GtkWidget *widget)
-{
-	if (animated_widgets)
-		return g_hash_table_lookup (animated_widgets, widget);
-	
-	return NULL;
-}
-
-/* Create all the relevant information for the animation, and insert it into the hash table. */
-static void
-add_animation (const GtkWidget *widget, gdouble stop_time)
-{
-	AnimationInfo *value;
-	
-	/* object already in the list, do not add it twice */
-	if (lookup_animation_info (widget))
-		return;
-	
-	if (animated_widgets == NULL)
-		animated_widgets = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-		                                          NULL, destroy_animation_info_and_weak_unref);
-	
-	value = g_new(AnimationInfo, 1);
-	
-	value->widget = (GtkWidget*) widget;
-	
-	value->timer = g_timer_new ();
-	value->stop_time= stop_time;
-	value->start_modifier = 0.0;
-
-	g_object_weak_ref (G_OBJECT (widget), on_animated_widget_destruction, value);
-	g_hash_table_insert (animated_widgets, (GtkWidget*) widget, value);
-	
-	start_timer ();
-}
-
-/* update the animation information for each widget. This will also queue a redraw
- * and stop the animation if it is done. */
-static gboolean
-update_animation_info (gpointer key, gpointer value, gpointer user_data)
-{
-	AnimationInfo *animation_info = value;
-	GtkWidget *widget = key;
-	
-	g_assert ((widget != NULL) && (animation_info != NULL));
-	
-	/* remove the widget from the hash table if it is not drawable */
-	if (!GTK_WIDGET_DRAWABLE (widget))
-	{
-		return TRUE;
-	}
-	
-	if (GE_IS_PROGRESS_BAR (widget))
-	{
-		gfloat fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (widget));
-		
-		/* stop animation for filled/not filled progress bars */
-		if (fraction <= 0.0 || fraction >= 1.0)
-			return TRUE;
-	}
-	
-	force_widget_redraw (widget);
-	
-	/* stop at stop_time */
-	if (animation_info->stop_time != 0 &&
-	    g_timer_elapsed (animation_info->timer, NULL) > animation_info->stop_time)
-		return TRUE;
-	
-	return FALSE;
-}
-
-/* This gets called by the glib main loop every once in a while. */
-static gboolean
-animation_timeout_handler (gpointer data)
-{
-	/*g_print("** TICK **\n");*/
-	
-	/* enter threads as update_animation_info will use gtk/gdk. */
-	gdk_threads_enter ();
-	g_hash_table_foreach_remove (animated_widgets, update_animation_info, NULL);
-	/* leave threads again */
-	gdk_threads_leave ();
-	
-	if(g_hash_table_size(animated_widgets)==0)
-	{
-		stop_timer ();
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-static void
-on_checkbox_toggle (GtkWidget *widget, gpointer data)
-{
-	AnimationInfo *animation_info = lookup_animation_info (widget);
-	
-	if (animation_info != NULL)
-	{
-		gfloat elapsed = g_timer_elapsed (animation_info->timer, NULL);
-		
-		animation_info->start_modifier = elapsed - animation_info->start_modifier;
-	}
-	else
-	{
-		add_animation (widget, CHECK_ANIMATION_TIME);
-	}
-}
-
-static void
-on_connected_widget_destruction (gpointer data, GObject *widget)
-{
-	connected_widgets = g_slist_remove (connected_widgets, data);
-	g_free (data);
-}
-
-static void
-disconnect_all_signals ()
-{
-	GSList * item = connected_widgets;
-	while (item != NULL)
-	{
-		SignalInfo *signal_info = (SignalInfo*) item->data;
-		
-		g_signal_handler_disconnect (signal_info->widget, signal_info->handler_id);
-		g_object_weak_unref (G_OBJECT (signal_info->widget), on_connected_widget_destruction, signal_info);
-		g_free (signal_info);
-		
-		item = g_slist_next (item);
-	}
-	
-	g_slist_free (connected_widgets);
-	connected_widgets = NULL;
-}
-
-/* helper function for clearlooks_animation_connect_checkbox */
-static gint
-find_signal_info (gconstpointer signal_info, gconstpointer widget)
-{
-	if (((SignalInfo*)signal_info)->widget == widget)
-		return 0;
-	else
-		return 1;
-}
-
-
-/* external interface */
-
-/* adds a progress bar */
-void
-clearlooks_animation_progressbar_add (GtkWidget *progressbar)
-{
-	gdouble fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progressbar));
-	
-	if (fraction < 1.0 && fraction > 0.0)
-		add_animation ((GtkWidget*) progressbar, 0.0);
-}
-
-/* hooks up the signals for check and radio buttons */
-void
-clearlooks_animation_connect_checkbox (GtkWidget *widget)
-{
-	if (GE_IS_CHECK_BUTTON (widget))
-	{
-		if (!g_slist_find_custom (connected_widgets, widget, find_signal_info))
-		{
-			SignalInfo * signal_info = g_new (SignalInfo, 1);
-			
-			signal_info->widget = widget;
-			signal_info->handler_id = g_signal_connect ((GObject*)widget, "toggled", G_CALLBACK (on_checkbox_toggle), NULL);
-			
-			connected_widgets = g_slist_append (connected_widgets, signal_info);
-			g_object_weak_ref (G_OBJECT (widget), on_connected_widget_destruction, signal_info);
-		}
-	}
-}
-
-/* returns TRUE if the widget is animated, and FALSE otherwise */
-gboolean
-clearlooks_animation_is_animated (GtkWidget *widget)
-{
-	return lookup_animation_info (widget) != NULL ? TRUE : FALSE;
-}
-
-/* returns the elapsed time for the animation */
-gdouble
-clearlooks_animation_elapsed (gpointer data)
-{
-	AnimationInfo *animation_info = lookup_animation_info (data);
-	
-	if (animation_info)
-		return   g_timer_elapsed (animation_info->timer, NULL)
-		       - animation_info->start_modifier;
-	else
-		return 0.0;
-}
-
-/* cleans up all resources of the animation system */
-void
-clearlooks_animation_cleanup ()
-{
-	disconnect_all_signals ();
-	
-	if (animated_widgets != NULL)
-	{
-		g_hash_table_destroy (animated_widgets);
-		animated_widgets = NULL;
-	}
-	
-	stop_timer ();
-}
-#else /* !HAVE_WORKING_ANIMATION */
-/* Warn here so the message is only displayed once. */
-#warning Disabling animation support as it currently needs deprecated symbols and GTK_DISABLE_DEPRECATED is enabled.
-
-static void clearlooks_animation_dummy_function_so_wall_shuts_up_when_animations_is_disabled()
-{
-	clearlooks_animation_dummy_function_so_wall_shuts_up_when_animations_is_disabled();
-}
-#endif /* HAVE_WORKING_ANIMATION */
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-09-25 17:02:08 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-01_libm.patch
-02_glib-single-include.patch
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-10 15:51:58 +0000
+++ debian/changelog	2013-12-15 20:38:39 +0000
@@ -1,3 +1,21 @@
+gtk2-engines (1:2.20.2-3ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from debian, remaining changes:
+    - debian/control: Build depend on gnome-common, so we can get a .pot file
+      to use for launchpad translations
+    - debian/rules: build translations template
+    - Update watch file to only track GNOME 2.20 as gtk-engines was then
+      ported to gtk3 and finally abandoned.
+  * Drop our automake fix, debian now supports the new version
+
+ -- Jackson Doak <[e-mail]>  Mon, 16 Dec 2013 07:09:33 +1100
+
+gtk2-engines (1:2.20.2-3) unstable; urgency=low
+
+  * Fix FTBS due to automake bug (Closes: #713353)
+
+ -- Balint Reczey <[e-mail]>  Fri, 15 Nov 2013 09:35:40 +0100
+
 gtk2-engines (1:2.20.2-2ubuntu2) saucy; urgency=low
 
   * Force to use automake1.11, thus fixing FTBFS.
 
=== modified file 'debian/control'
--- debian/control	2013-10-10 15:51:58 +0000
+++ debian/control	2013-12-15 20:38:39 +0000
@@ -11,7 +11,6 @@
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
-	       automake1.11,
                gnome-common,
                libgtk2.0-dev (>= 2.19.7-2),
                gnome-pkg-tools (>= 0.10),
 
=== modified file 'debian/control.in'
--- debian/control.in	2013-10-10 15:51:58 +0000
+++ debian/control.in	2013-12-15 20:38:39 +0000
@@ -7,7 +7,6 @@
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
-	       automake1.11,
                gnome-common,
                libgtk2.0-dev (>= 2.19.7-2),
                gnome-pkg-tools (>= 0.10),
 
=== added file 'debian/patches/03_automake1.14.patch'
--- debian/patches/03_automake1.14.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_automake1.14.patch	2013-12-15 20:38:39 +0000
@@ -0,0 +1,49 @@
+Description: Work around FTBFS due to automake 1.14 bug
+ Automake generates invalid Makefiles when patsubst is used in
+ Makefile.am. To work around this problem configure injects the
+ patsubsts to the Makefile now.
+ .
+Author: Balint Reczey <[e-mail]>
+Bug-Debian: http://bugs.debian.org/713353
+--- gtk2-engines-2.20.2.orig/configure.ac
++++ gtk2-engines-2.20.2/configure.ac
+@@ -142,6 +142,8 @@ fi
+ AC_SUBST(BUILD_ENGINES)
+ AC_SUBST(BUILD_THEMES)
+ AC_SUBST(BUILD_SCHEMAS)
++AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))'])
++
+ 
+ if test $animation = "yes"; then
+ 	AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
+--- gtk2-engines-2.20.2.orig/test/Makefile.am
++++ gtk2-engines-2.20.2/test/Makefile.am
+@@ -64,9 +64,10 @@ VALGRIND_ENV=G_SLICE=always-malloc G_DEB
+ # Exported Symbols Test - Tests all engines unconditionally
+ #############################################################
+ # Prefix with exported_
+-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
++# disabled to work around automake bug #14561
++# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
+ 
+-TESTS += $(EXPORTED_SYMBOLS_TESTS)
++#TESTS += $(EXPORTED_SYMBOLS_TESTS)
+ 
+ 
+ #############################################################
+@@ -85,10 +86,13 @@ SUPPORTED_TORTURE_TEST_ENGINES = \
+ # Filter engines that are not build from the set of engines
+ TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
+ # Prefix with torture_
+-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
++# disabled to work around automake bug #14561
++# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
+ 
+ # Add TORTURE_TEST_ENGINES to list of tests
+-TESTS += $(TORTURE_TEST_TESTS)
++# disabled to work around automake bug #14561
++#TESTS += $(TORTURE_TEST_TESTS)
++TESTS += @auto_find_tests@
+ 
+ # Possible other tests:
+ #  - An extensive theme switch tests that loads/unloads the engine
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-25 17:02:08 +0000
+++ debian/patches/series	2013-12-15 20:38:39 +0000
@@ -1,2 +1,3 @@
 01_libm.patch
 02_glib-single-include.patch
+03_automake1.14.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-10-10 15:51:58 +0000
+++ debian/rules	2013-12-15 20:38:39 +0000
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-export AUTOMAKE=automake-1.11
-export ACLOCAL=aclocal-1.11
-
 buildbasedir := $(CURDIR)/debian/build
 DEB_BUILDDIR := $(buildbasedir)/x11
 DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/x11-udeb
 
=== modified file 'engines/clearlooks/Makefile.am'
--- engines/clearlooks/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/clearlooks/Makefile.am	2013-12-15 20:38:39 +0000
@@ -43,7 +43,7 @@
 	./src/clearlooks_types.h
 
 libclearlooks_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libclearlooks_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libclearlooks_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 
 -include $(top_srcdir)/git.mk
 
=== modified file 'engines/clearlooks/src/animation.c'
--- engines/clearlooks/src/animation.c	2012-09-25 17:02:08 +0000
+++ engines/clearlooks/src/animation.c	2013-12-15 20:38:39 +0000
@@ -28,7 +28,7 @@
 #include "animation.h"
 
 #ifdef HAVE_WORKING_ANIMATION
-#include <glib.h>
+#include <glib/gtimer.h>
 
 struct _AnimationInfo {
 	GTimer *timer;
 
=== modified file 'engines/crux/Makefile.am'
--- engines/crux/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/crux/Makefile.am	2013-12-15 20:38:39 +0000
@@ -19,7 +19,7 @@
 	./src/crux-rc-style.h
 
 libcrux_engine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libcrux_engine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libcrux_engine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'engines/glide/Makefile.am'
--- engines/glide/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/glide/Makefile.am	2013-12-15 20:38:39 +0000
@@ -34,7 +34,7 @@
 	./src/glide_gtk2_engine.h
 
 libglide_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libglide_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libglide_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'engines/hc/Makefile.am'
--- engines/hc/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/hc/Makefile.am	2013-12-15 20:38:39 +0000
@@ -38,7 +38,7 @@
 	./src/hc-style.c
 
 libhcengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'engines/industrial/Makefile.am'
--- engines/industrial/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/industrial/Makefile.am	2013-12-15 20:38:39 +0000
@@ -39,7 +39,7 @@
 	./AUTHORS
 
 libindustrial_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libindustrial_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libindustrial_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'engines/lua/Makefile.am'
--- engines/lua/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/lua/Makefile.am	2013-12-15 20:38:39 +0000
@@ -111,7 +111,7 @@
 	$(NULL)
 
 libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS) -lm
+libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'engines/mist/Makefile.am'
--- engines/mist/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/mist/Makefile.am	2013-12-15 20:38:39 +0000
@@ -16,7 +16,7 @@
 	./src/mist.c
 
 libmist_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'engines/redmond/Makefile.am'
--- engines/redmond/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/redmond/Makefile.am	2013-12-15 20:38:39 +0000
@@ -37,7 +37,7 @@
 	./src/redmond_gtk2_engine.h
 
 libredmond95_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libredmond95_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libredmond95_la_LIBADD =  $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'engines/thinice/Makefile.am'
--- engines/thinice/Makefile.am	2011-12-05 20:26:07 +0000
+++ engines/thinice/Makefile.am	2013-12-15 20:38:39 +0000
@@ -18,7 +18,7 @@
 	./src/thinice_main.c
 
 libthinice_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
-libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm
+libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
 
 
=== modified file 'test/Makefile.am'
--- test/Makefile.am	2011-12-05 20:26:07 +0000
+++ test/Makefile.am	2013-12-15 20:38:39 +0000
@@ -42,7 +42,7 @@
 
 EXTRA_PROGRAMS = torturetest
 torturetest_CFLAGS = $(GTK_CFLAGS)
-torturetest_LDFLAGS = $(GTK_LIBS) -lm
+torturetest_LDFLAGS = $(GTK_LIBS)