Commit a95aa16e authored by Paolo Bacchilega's avatar Paolo Bacchilega
Browse files

Fix GTK+ single includes

parent 6004dc8e
......@@ -35,6 +35,10 @@ GSTREAMER_REQUIRED=0.10
dnl ===========================================================================
CFLAGS=""
CFLAGS+="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES "
CFLAGS+="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED "
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug], [enable compilation of debugging messages]),
[case "${enableval}" in
......@@ -45,7 +49,7 @@ AC_ARG_ENABLE(debug,
[ENABLE_DEBUG=no])
if test x$ENABLE_DEBUG = xyes; then
AC_DEFINE(DEBUG, 1, [enable compilation of debugging messages])
CFLAGS="-g -O0"
CFLAGS+="-g -O0 "
fi
AC_ARG_ENABLE(run_in_place,
......@@ -204,16 +208,6 @@ else
fi
AC_SUBST(EXTENSION_LIBTOOL_FLAGS)
dnl ===========================================================================
AC_ARG_ENABLE(deprecations,
[AS_HELP_STRING([--enable-deprecations],[warn about deprecated usages])])
if test "x$enable_deprecations" = "xyes"; then
DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
fi
AC_SUBST(DISABLE_DEPRECATED)
dnl ===========================================================================
WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wclobbered -Wempty-body -Wignored-qualifiers"
......@@ -232,8 +226,7 @@ for option in $WARN_CFLAGS; do
unset SAVE_CFLAGS
done
unset option
AC_SUBST(WARNINGS)
CFLAGS+="$WARNINGS "
dnl ===========================================================================
......@@ -363,6 +356,7 @@ Configuration:
Source code location : $srcdir
Compiler : $CC
Prefix : $prefix
CFLAGS : $CFLAGS
Debug : $ENABLE_DEBUG
Run in place : ${enable_run_in_place}
Build tests : $ENABLE_TEST_SUITE
......
INCLUDES = -DGTK_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DG_DISABLE_DEPRECATED
noinst_LTLIBRARIES = libeggsmclient.la
libeggsmclient_la_LIBADD = $(GTK_LIBS)
......
......@@ -12,7 +12,7 @@ libbookmarks_la_SOURCES = \
dlg-bookmarks.h \
main.c
libbookmarks_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libbookmarks_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libbookmarks_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libbookmarks_la_LIBADD = $(GTHUMB_LIBS)
libbookmarks_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -23,7 +23,7 @@
#ifndef ACTIONS_H
#define ACTIONS_H
#include <gtk/gtkaction.h>
#include <gtk/gtk.h>
#define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
......
......@@ -16,7 +16,7 @@ libcatalogs_la_SOURCES = \
gth-file-source-catalogs.h \
main.c
libcatalogs_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libcatalogs_la_CFLAGS = $(GTHUMB_CFLAGS) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libcatalogs_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libcatalogs_la_LIBADD = $(GTHUMB_LIBS)
libcatalogs_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -23,7 +23,7 @@
#ifndef ACTIONS_H
#define ACTIONS_H
#include <gtk/gtkaction.h>
#include <gtk/gtk.h>
#define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
......
......@@ -14,7 +14,7 @@ libcomments_la_SOURCES = \
gth-test-category.h \
main.c
libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libcomments_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libcomments_la_LIBADD = $(GTHUMB_LIBS)
libcomments_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -9,7 +9,7 @@ libdesktop_background_la_SOURCES = \
callbacks.h \
main.c
libdesktop_background_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libdesktop_background_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libdesktop_background_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libdesktop_background_la_LIBADD = $(GTHUMB_LIBS)
libdesktop_background_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -10,7 +10,7 @@ libexiv2_la_SOURCES = \
gth-metadata-provider-exiv2.h \
main.c
libexiv2_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(EXIV2_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libexiv2_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(EXIV2_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libexiv2_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libexiv2_la_LIBADD = $(GTHUMB_LIBS)
libexiv2_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -16,7 +16,7 @@ libfile_manager_la_SOURCES = \
gth-reorder-task.h \
main.c
libfile_manager_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libfile_manager_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libfile_manager_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libfile_manager_la_LIBADD = $(GTHUMB_LIBS)
libfile_manager_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -34,7 +34,7 @@ libfile_tools_la_SOURCES = \
gth-file-tool-undo.h \
main.c
libfile_tools_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libfile_tools_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libfile_tools_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libfile_tools_la_LIBADD = $(GTHUMB_LIBS)
libfile_tools_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -6,7 +6,7 @@ libfile_viewer_la_SOURCES = \
gth-file-viewer-page.h \
main.c
libfile_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libfile_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libfile_viewer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libfile_viewer_la_LIBADD = $(GTHUMB_LIBS)
libfile_viewer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -19,7 +19,7 @@ libgstreamer_la_SOURCES = \
main.c \
preferences.h
libgstreamer_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(GSTREAMER_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libgstreamer_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(GSTREAMER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libgstreamer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libgstreamer_la_LIBADD = $(GTHUMB_LIBS)
libgstreamer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -17,7 +17,7 @@ libimage_print_la_SOURCES = \
preferences.h \
main.c
libimage_print_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libimage_print_la_CPPFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libimage_print_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libimage_print_la_LIBADD = $(GTHUMB_LIBS)
libimage_print_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -13,7 +13,7 @@ libimage_rotation_la_SOURCES = \
rotation-utils.c \
rotation-utils.h
libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libimage_rotation_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libimage_rotation_la_LIBADD = $(GTHUMB_LIBS)
libimage_rotation_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -12,7 +12,7 @@ libimage_viewer_la_SOURCES = \
preferences.c \
preferences.h
libimage_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libimage_viewer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libimage_viewer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libimage_viewer_la_LIBADD = $(GTHUMB_LIBS)
libimage_viewer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -24,7 +24,7 @@
#include <string.h>
#include <glib/gi18n.h>
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf-io.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gthumb.h>
#include "gth-metadata-provider-image.h"
......
......@@ -16,7 +16,7 @@ else
libjpeg_utils_la_SOURCES =
endif
libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libjpeg_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libjpeg_utils_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS)
libjpeg_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -20,7 +20,7 @@ liblist_tools_la_SOURCES = \
gth-script-task.c \
main.c
liblist_tools_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
liblist_tools_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
liblist_tools_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
liblist_tools_la_LIBADD = $(GTHUMB_LIBS)
liblist_tools_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
......@@ -44,7 +44,7 @@ libphoto_importer_la_SOURCES = \
gth-import-task.c \
main.c
libphoto_importer_la_CFLAGS = $(GTHUMB_CFLAGS) $(DISABLE_DEPRECATED) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libphoto_importer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
libphoto_importer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
libphoto_importer_la_LIBADD = $(GTHUMB_LIBS)
libphoto_importer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment