From 09578ea07075acf70d3b19792e3dce11e005d28d Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 25 Jun 2007 12:41:59 +0000 Subject: [PATCH] removed extra check for gthread and fold it into the GLIB and GTK checks. 2007-06-25 Sven Neumann * configure.in: removed extra check for gthread and fold it into the GLIB and GTK checks. * */Makefile.am: changed accordingly. * app/main.c (main): always call g_thread_init(). svn path=/trunk/; revision=22832 --- ChangeLog | 9 +++++++++ app/Makefile.am | 6 ++---- app/actions/Makefile.am | 3 +-- app/base/Makefile.am | 3 +-- app/composite/Makefile.am | 3 +-- app/config/Makefile.am | 5 ++--- app/core/Makefile.am | 4 ++-- app/dialogs/Makefile.am | 3 +-- app/display/Makefile.am | 3 +-- app/file/Makefile.am | 4 ++-- app/gui/Makefile.am | 3 +-- app/main.c | 5 +---- app/menus/Makefile.am | 3 +-- app/paint-funcs/Makefile.am | 3 +-- app/paint/Makefile.am | 4 ++-- app/pdb/Makefile.am | 4 ++-- app/plug-in/Makefile.am | 4 ++-- app/text/Makefile.am | 4 ++-- app/tools/Makefile.am | 3 +-- app/vectors/Makefile.am | 4 ++-- app/widgets/Makefile.am | 3 +-- app/xcf/Makefile.am | 4 ++-- configure.in | 11 +++++------ devel-docs/app/Makefile.am | 1 - devel-docs/app/app-sections.txt | 2 -- libgimp/Makefile.am | 3 +-- libgimpbase/Makefile.am | 9 ++++----- libgimpcolor/Makefile.am | 3 +-- libgimpconfig/Makefile.am | 3 +-- libgimpmath/Makefile.am | 3 +-- libgimpmodule/Makefile.am | 3 +-- libgimpthumb/Makefile.am | 4 ++-- libgimpwidgets/Makefile.am | 3 +-- 33 files changed, 57 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 797d5405f8..4c578ad910 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-06-25 Sven Neumann + + * configure.in: removed extra check for gthread and fold it into + the GLIB and GTK checks. + + * */Makefile.am: changed accordingly. + + * app/main.c (main): always call g_thread_init(). + 2007-06-25 Sven Neumann * libgimpbase/gimpwire.c: if the wire protocol is used without diff --git a/app/Makefile.am b/app/Makefile.am index 1649bade91..47e3652cda 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -82,8 +82,7 @@ endif AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Gimp\" \ - -DGIMP_APP_GLUE_COMPILATION \ - @GTHREAD_CFLAGS@ + -DGIMP_APP_GLUE_COMPILATION INCLUDES = \ -I$(top_srcdir) \ @@ -133,7 +132,6 @@ gimp_2_3_LDADD = \ $(FONTCONFIG_LIBS) \ $(FREETYPE_LIBS) \ $(DBUS_GLIB_LIBS) \ - $(GTHREAD_LIBS) \ $(RT_LIBS) \ $(INTLLIBS) \ $(GIMPICONRC) @@ -176,7 +174,7 @@ gimp_console_2_3_LDADD = \ $(PANGOFT2_LIBS) \ $(FONTCONFIG_LIBS) \ $(FREETYPE_LIBS) \ - $(GTHREAD_LIBS) \ + $(GLIB_LIBS) \ $(RT_LIBS) \ $(INTLLIBS) \ $(GIMPICONRC) diff --git a/app/actions/Makefile.am b/app/actions/Makefile.am index 3618e3d312..15bde92373 100644 --- a/app/actions/Makefile.am +++ b/app/actions/Makefile.am @@ -159,8 +159,7 @@ EXTRA_DIST = \ makefile.msc AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Actions\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Actions\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/base/Makefile.am b/app/base/Makefile.am index 5fa1caacd4..0ce41980fc 100644 --- a/app/base/Makefile.am +++ b/app/base/Makefile.am @@ -56,8 +56,7 @@ libappbase_a_SOURCES = \ tile-swap.h AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Base\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Base\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/composite/Makefile.am b/app/composite/Makefile.am index 7cc53c6020..ed92ff5b17 100644 --- a/app/composite/Makefile.am +++ b/app/composite/Makefile.am @@ -4,8 +4,7 @@ libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Composite\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Composite\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/config/Makefile.am b/app/config/Makefile.am index 3cef45f351..b414d5712d 100644 --- a/app/config/Makefile.am +++ b/app/config/Makefile.am @@ -40,16 +40,15 @@ libappconfig_a_SOURCES = \ gimpxmlparser.h AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Config\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Config\" INCLUDES = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ - $(GLIB_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) diff --git a/app/core/Makefile.am b/app/core/Makefile.am index 44cd4eae61..74240e07b0 100644 --- a/app/core/Makefile.am +++ b/app/core/Makefile.am @@ -2,8 +2,7 @@ AM_CPPFLAGS = \ -DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\" \ - -DG_LOG_DOMAIN=\"Gimp-Core\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Core\" INCLUDES = \ -I$(top_builddir) \ @@ -12,6 +11,7 @@ INCLUDES = \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ $(LIBART_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) noinst_LIBRARIES = libappcore.a diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am index 0d3d5303e6..e0c6786d32 100644 --- a/app/dialogs/Makefile.am +++ b/app/dialogs/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Dialogs\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Dialogs\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/display/Makefile.am b/app/display/Makefile.am index 1403d42616..6ea0d9e5bf 100644 --- a/app/display/Makefile.am +++ b/app/display/Makefile.am @@ -71,8 +71,7 @@ libappdisplay_a_SOURCES = \ $(libappdisplay_a_sources) AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Display\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Display\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/file/Makefile.am b/app/file/Makefile.am index d18363cd41..a689fb2c18 100644 --- a/app/file/Makefile.am +++ b/app/file/Makefile.am @@ -3,8 +3,7 @@ noinst_LIBRARIES = libappfile.a AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-File\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-File\" INCLUDES = \ -I$(top_builddir) \ @@ -12,6 +11,7 @@ INCLUDES = \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) libappfile_a_SOURCES = \ diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am index fb3285de91..f116dcb66b 100644 --- a/app/gui/Makefile.am +++ b/app/gui/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-GUI\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-GUI\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/main.c b/app/main.c index e18edd8f78..ca7af608ca 100644 --- a/app/main.c +++ b/app/main.c @@ -285,10 +285,7 @@ main (int argc, gchar *basename; gint i; -#ifdef ENABLE_MP - if (! g_thread_supported ()) - g_thread_init (NULL); -#endif + g_thread_init (NULL); #ifdef GIMP_UNSTABLE gimp_open_console_window (); diff --git a/app/menus/Makefile.am b/app/menus/Makefile.am index caa0e9ce76..90aacbe9e5 100644 --- a/app/menus/Makefile.am +++ b/app/menus/Makefile.am @@ -26,8 +26,7 @@ EXTRA_DIST = \ makefile.msc AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Menus\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Menus\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/paint-funcs/Makefile.am b/app/paint-funcs/Makefile.am index fdf9e15f74..7bd8d6cd69 100644 --- a/app/paint-funcs/Makefile.am +++ b/app/paint-funcs/Makefile.am @@ -19,8 +19,7 @@ INCLUDES = \ -I$(includedir) AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Paint-Funcs\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Paint-Funcs\" AM_CCASFLAGS = \ -I$(top_builddir) \ diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am index 3efe569a82..b1c5bfff97 100644 --- a/app/paint/Makefile.am +++ b/app/paint/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Paint\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Paint\" INCLUDES = \ -I$(top_builddir) \ @@ -10,6 +9,7 @@ INCLUDES = \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) noinst_LIBRARIES = libapppaint.a diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am index 259c0a85d0..bcfa5b71ad 100644 --- a/app/pdb/Makefile.am +++ b/app/pdb/Makefile.am @@ -65,8 +65,7 @@ libappinternal_procs_a_SOURCES = \ vectors_cmds.c AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-PDB\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-PDB\" INCLUDES = \ -I$(top_builddir) \ @@ -74,6 +73,7 @@ INCLUDES = \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) EXTRA_DIST = makefile.msc diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am index f82a6fbd31..311d9d3608 100644 --- a/app/plug-in/Makefile.am +++ b/app/plug-in/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Plug-In\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Plug-In\" INCLUDES = \ -I$(top_builddir) \ @@ -10,6 +9,7 @@ INCLUDES = \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) noinst_LIBRARIES = libappplug-in.a diff --git a/app/text/Makefile.am b/app/text/Makefile.am index ebf92433b8..ed488303fa 100644 --- a/app/text/Makefile.am +++ b/app/text/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Text\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Text\" INCLUDES = \ -I$(top_builddir) \ @@ -11,6 +10,7 @@ INCLUDES = \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ $(PANGOFT2_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) noinst_LIBRARIES = libapptext.a diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am index 09f16c51fb..85ae385779 100644 --- a/app/tools/Makefile.am +++ b/app/tools/Makefile.am @@ -175,8 +175,7 @@ libapptools_a_SOURCES = $(libapptools_a_built_sources) $(libapptools_a_sources) AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Tools\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Tools\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/vectors/Makefile.am b/app/vectors/Makefile.am index e729ce33a1..7a9f15345f 100644 --- a/app/vectors/Makefile.am +++ b/app/vectors/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Vectors\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Vectors\" INCLUDES = \ -I$(top_builddir) \ @@ -11,6 +10,7 @@ INCLUDES = \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ $(LIBART_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) noinst_LIBRARIES = libappvectors.a diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am index b21c0b4648..aa20628452 100644 --- a/app/widgets/Makefile.am +++ b/app/widgets/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-Widgets\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-Widgets\" INCLUDES = \ -I$(top_builddir) \ diff --git a/app/xcf/Makefile.am b/app/xcf/Makefile.am index 983a2a889e..f1aabb94d2 100644 --- a/app/xcf/Makefile.am +++ b/app/xcf/Makefile.am @@ -18,8 +18,7 @@ libappxcf_a_SOURCES = \ xcf-write.h AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Gimp-XCF\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"Gimp-XCF\" INCLUDES = \ -I$(top_builddir) \ @@ -27,6 +26,7 @@ INCLUDES = \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ $(GDK_PIXBUF_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) EXTRA_DIST = makefile.msc diff --git a/configure.in b/configure.in index 60137c6771..fb482eb22b 100644 --- a/configure.in +++ b/configure.in @@ -418,7 +418,7 @@ AM_GLIB_GNU_GETTEXT AM_PATH_GLIB_2_0(glib_required_version, :, AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.), - gobject) + gobject gthread) PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0) @@ -443,7 +443,8 @@ LIBS=$gimp_save_LIBS AC_PATH_XTRA AM_PATH_GTK_2_0(gtk_required_version, :, - AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.)) + AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.), + gthread) AC_MSG_CHECKING([if GTK+ is version 2.11.0 or newer]) if $PKG_CONFIG --atleast-version=2.11.0 gtk+-2.0; then @@ -884,10 +885,8 @@ fi AC_ARG_ENABLE(mp, [ --disable-mp disable support for multiple processors]) if test "x$enable_mp" != "xno"; then - PKG_CHECK_MODULES(GTHREAD, gthread-2.0, - [AC_DEFINE(ENABLE_MP, 1, - [Define to 1 to enable support for multiple processors.])] - ) + AC_DEFINE(ENABLE_MP, 1, + [Define to 1 to enable support for multiple processors.]) fi diff --git a/devel-docs/app/Makefile.am b/devel-docs/app/Makefile.am index 142545afdb..d9e52b67dc 100644 --- a/devel-docs/app/Makefile.am +++ b/devel-docs/app/Makefile.am @@ -103,7 +103,6 @@ GTKDOC_LIBS = \ $(FONTCONFIG_LIBS) \ $(FREETYPE_LIBS) \ $(DBUS_GLIB_LIBS) \ - $(GTHREAD_LIBS) \ $(RT_LIBS) \ $(INTLLIBS) diff --git a/devel-docs/app/app-sections.txt b/devel-docs/app/app-sections.txt index 06690984cf..2104d01854 100644 --- a/devel-docs/app/app-sections.txt +++ b/devel-docs/app/app-sections.txt @@ -7122,8 +7122,6 @@ tile_manager_get tile_manager_map_tile tile_manager_map tile_manager_validate -tile_manager_set_user_data -tile_manager_get_user_data tile_manager_width tile_manager_height tile_manager_bpp diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 61b72e10dd..bde2784bcf 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -58,8 +58,7 @@ endif gimpincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimp AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibGimp\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimp\" INCLUDES = \ -I$(top_srcdir) \ diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am index 697cd45e6f..c7a3f30ea1 100644 --- a/libgimpbase/Makefile.am +++ b/libgimpbase/Makefile.am @@ -51,17 +51,16 @@ AM_CPPFLAGS = \ -DGIMP_DATA_VERSION=\"$(GIMP_DATA_VERSION)\" \ -DGIMP_SYSCONF_VERSION=\"$(GIMP_SYSCONF_VERSION)\" \ -DGIMP_PLUGIN_VERSION=\"$(GIMP_PLUGIN_VERSION)\" \ - -DG_LOG_DOMAIN=\"LibGimpBase\" \ - @BINRELOC_CFLAGS@ \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimpBase\" AM_CCASFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) INCLUDES = \ - -I$(top_srcdir) \ - $(GLIB_CFLAGS) \ + -I$(top_srcdir) \ + $(GLIB_CFLAGS) \ + $(BINRELOC_CFLAGS) \ -I$(includedir) EXTRA_DIST = \ diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index 23c9493b33..ad7b0642f5 100644 --- a/libgimpcolor/Makefile.am +++ b/libgimpcolor/Makefile.am @@ -47,8 +47,7 @@ endif libgimpcolorincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpcolor AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibGimpColor\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimpColor\" INCLUDES = \ -I$(top_srcdir) \ diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am index 14f40dfb88..d3d2dde5c4 100644 --- a/libgimpconfig/Makefile.am +++ b/libgimpconfig/Makefile.am @@ -44,8 +44,7 @@ endif libgimpconfigincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpconfig AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibGimpConfig\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimpConfig\" INCLUDES = \ -I$(top_srcdir) \ diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am index 855d6a0513..c660092ec4 100644 --- a/libgimpmath/Makefile.am +++ b/libgimpmath/Makefile.am @@ -47,8 +47,7 @@ endif libgimpmathincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmath AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibGimpMath\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimpMath\" INCLUDES = \ -I$(top_srcdir) \ diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am index be813b2149..12560bf227 100644 --- a/libgimpmodule/Makefile.am +++ b/libgimpmodule/Makefile.am @@ -42,8 +42,7 @@ endif libgimpmoduleincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmodule AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibGimpModule\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimpModule\" INCLUDES = \ -I$(top_srcdir) \ diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am index 1f6c96706c..bd72b00bcb 100644 --- a/libgimpthumb/Makefile.am +++ b/libgimpthumb/Makefile.am @@ -42,12 +42,12 @@ endif libgimpthumbincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpthumb AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibGimpThumb\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimpThumb\" INCLUDES = \ -I$(top_srcdir) \ $(GDK_PIXBUF_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(includedir) EXTRA_DIST = \ diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index a3924556ab..1d4ce40677 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -49,8 +49,7 @@ endif libgimpwidgetsincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpwidgets AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibGimpWidgets\" \ - @GTHREAD_CFLAGS@ + -DG_LOG_DOMAIN=\"LibGimpWidgets\" INCLUDES = \ -I$(top_srcdir) \