Commit db82a33c authored by Giovanni Campagna's avatar Giovanni Campagna

Move include files to libgnome-desktop/

gobject-introspection requires all header and source files to be
defined in one place. This is one way to achieve that, without
using non recursive automake.
Also, remove the outdated references to libgnome and libgnomeui

https://bugzilla.gnome.org/show_bug.cgi?id=630913
parent 1aac0bd5
......@@ -230,8 +230,6 @@ gnome-about/Makefile
gnome-about/gnome-about.desktop.in
gnome-about/headers/Makefile
libgnome-desktop/Makefile
libgnome-desktop/libgnome/Makefile
libgnome-desktop/libgnomeui/Makefile
libgnome-desktop/gnome-desktop-3.0.pc
libgnome-desktop/gnome-desktop-3.0-uninstalled.pc
docs/Makefile
......
SUBDIRS = libgnome libgnomeui
lib_LTLIBRARIES = libgnome-desktop-3.la
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GNOME_DESKTOP_CFLAGS) \
$(XLIB_CFLAGS) \
-DG_LOG_DOMAIN=\"GnomeDesktop\" \
......@@ -38,6 +37,16 @@ libgnome_desktop_3_la_LDFLAGS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-desktop-3.0.pc
libgnome_desktopdir = $(includedir)/gnome-desktop-3.0/libgnome-destkop
libgnome_desktop_HEADERS = \
gnome-bg.h \
gnome-bg-crossfade.h \
gnome-desktop-utils.h \
gnome-desktop-thumbnail.h \
gnome-rr.h \
gnome-rr-config.h \
gnome-rr-labeler.h
if USE_INTERNAL_PNP_IDS
pnpdatadir = $(datadir)/libgnome-desktop-3.0
pnpdata_DATA = pnp.ids
......
......@@ -36,8 +36,8 @@
#include <cairo-xlib.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnomeui/gnome-bg.h>
#include "libgnomeui/gnome-bg-crossfade.h"
#include "gnome-bg.h"
#include "gnome-bg-crossfade.h"
struct _GnomeBGCrossfadePrivate
{
......
......@@ -33,6 +33,7 @@ Author: Soren Sandmann <sandmann@redhat.com>
#include <stdlib.h>
#include <gio/gio.h>
#include <gdesktop-enums.h>
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
......@@ -42,9 +43,8 @@ Author: Soren Sandmann <sandmann@redhat.com>
#include <cairo-xlib.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnomeui/gnome-bg.h>
#include <libgnomeui/gnome-bg-crossfade.h>
#include <gdesktop-enums.h>
#include "gnome-bg.h"
#include "gnome-bg-crossfade.h"
#define BG_KEY_DRAW_BACKGROUND "draw-background"
#define BG_KEY_PRIMARY_COLOR "primary-color"
......
......@@ -31,9 +31,9 @@
#include <gdk/gdk.h>
#include <gio/gio.h>
#include <libgnomeui/gnome-desktop-thumbnail.h>
#include <libgnomeui/gnome-bg-crossfade.h>
#include <gdesktop-enums.h>
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
#include <libgnome-desktop/gnome-bg-crossfade.h>
G_BEGIN_DECLS
......
......@@ -40,7 +40,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include "libgnomeui/gnome-desktop-thumbnail.h"
#include "gnome-desktop-thumbnail.h"
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
#include <glib/gstdio.h>
......
......@@ -30,7 +30,7 @@
#include <glib/gi18n-lib.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnome/gnome-desktop-utils.h>
#include "gnome-desktop-utils.h"
#include "private.h"
......
......@@ -35,7 +35,7 @@
#include <gdk/gdkx.h>
#undef GNOME_DISABLE_DEPRECATED
#include "libgnomeui/gnome-rr-config.h"
#include "gnome-rr-config.h"
#include "edid.h"
#include "gnome-rr-private.h"
......
......@@ -28,8 +28,8 @@
#error gnome-rr-config.h is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnome-rr-config.h
#endif
#include <libgnomeui/gnome-rr.h>
#include <glib.h>
#include <libgnome-desktop/gnome-rr.h>
typedef struct GnomeOutputInfo GnomeOutputInfo;
typedef struct GnomeRRConfig GnomeRRConfig;
......
......@@ -29,7 +29,7 @@
#include <config.h>
#include <glib/gi18n-lib.h>
#include "libgnomeui/gnome-rr-labeler.h"
#include "gnome-rr-labeler.h"
#include <gtk/gtk.h>
#include <X11/Xproto.h>
......
......@@ -30,7 +30,7 @@
#error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
#endif
#include <libgnomeui/gnome-rr-config.h>
#include <libgnome-desktop/gnome-rr-config.h>
#define GNOME_TYPE_RR_LABELER (gnome_rr_labeler_get_type ())
#define GNOME_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, GnomeRRLabeler))
......
......@@ -38,7 +38,7 @@
#include <X11/Xatom.h>
#undef GNOME_DISABLE_DEPRECATED
#include "libgnomeui/gnome-rr.h"
#include "gnome-rr.h"
#include "private.h"
#include "gnome-rr-private.h"
......
......@@ -30,7 +30,7 @@
#include <glib.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include "libgnomeui/gnome-desktop-thumbnail.h"
#include "gnome-desktop-thumbnail.h"
#define LOAD_BUFFER_SIZE 65536
......
libgnome_desktopdir = $(includedir)/gnome-desktop-3.0/libgnome
libgnome_desktop_HEADERS = \
gnome-desktop-utils.h
-include $(top_srcdir)/git.mk
libgnomeui_desktopdir = $(includedir)/gnome-desktop-3.0/libgnomeui
libgnomeui_desktop_HEADERS = \
gnome-bg.h \
gnome-bg-crossfade.h \
gnome-desktop-thumbnail.h \
gnome-rr.h \
gnome-rr-config.h \
gnome-rr-labeler.h
-include $(top_srcdir)/git.mk
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