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

19 files changed, 26 insertions, 34 deletions

diff --git a/configure.ac b/configure.ac
index 6408b592..9d401b2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index a98bc74e..edcaa54a 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -1,8 +1,7 @@
-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
diff --git a/libgnome-desktop/gnome-bg-crossfade.c b/libgnome-desktop/gnome-bg-crossfade.c
index 2c4d3515..df6a2850 100644
--- a/libgnome-desktop/gnome-bg-crossfade.c
+++ b/libgnome-desktop/gnome-bg-crossfade.c
@@ -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
 {
diff --git a/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h b/libgnome-desktop/gnome-bg-crossfade.h
index 6bd5886e..6bd5886e 100644
--- a/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h
+++ b/libgnome-desktop/gnome-bg-crossfade.h
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
index 215e089d..9ad616bd 100644
--- a/libgnome-desktop/gnome-bg.c
+++ b/libgnome-desktop/gnome-bg.c
@@ -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"
diff --git a/libgnome-desktop/libgnomeui/gnome-bg.h b/libgnome-desktop/gnome-bg.h
index 786dce98..34f1039e 100644
--- a/libgnome-desktop/libgnomeui/gnome-bg.h
+++ b/libgnome-desktop/gnome-bg.h
@@ -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
 
diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
index 9660307f..71871dfc 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
@@ -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>
diff --git a/libgnome-desktop/libgnomeui/gnome-desktop-thumbnail.h b/libgnome-desktop/gnome-desktop-thumbnail.h
index b78dba46..b78dba46 100644
--- a/libgnome-desktop/libgnomeui/gnome-desktop-thumbnail.h
+++ b/libgnome-desktop/gnome-desktop-thumbnail.h
diff --git a/libgnome-desktop/gnome-desktop-utils.c b/libgnome-desktop/gnome-desktop-utils.c
index 9822a0d9..e0ec3abc 100644
--- a/libgnome-desktop/gnome-desktop-utils.c
+++ b/libgnome-desktop/gnome-desktop-utils.c
@@ -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"
 
diff --git a/libgnome-desktop/libgnome/gnome-desktop-utils.h b/libgnome-desktop/gnome-desktop-utils.h
index aac6ce0c..aac6ce0c 100644
--- a/libgnome-desktop/libgnome/gnome-desktop-utils.h
+++ b/libgnome-desktop/gnome-desktop-utils.h
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
index 15ff0a39..daf626d5 100644
--- a/libgnome-desktop/gnome-rr-config.c
+++ b/libgnome-desktop/gnome-rr-config.c
@@ -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"
diff --git a/libgnome-desktop/libgnomeui/gnome-rr-config.h b/libgnome-desktop/gnome-rr-config.h
index d55a38c9..6c3aa227 100644
--- a/libgnome-desktop/libgnomeui/gnome-rr-config.h
+++ b/libgnome-desktop/gnome-rr-config.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;
diff --git a/libgnome-desktop/gnome-rr-labeler.c b/libgnome-desktop/gnome-rr-labeler.c
index 276c1a65..1de45692 100644
--- a/libgnome-desktop/gnome-rr-labeler.c
+++ b/libgnome-desktop/gnome-rr-labeler.c
@@ -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>
diff --git a/libgnome-desktop/libgnomeui/gnome-rr-labeler.h b/libgnome-desktop/gnome-rr-labeler.h
index 5b751cc3..b62e38b3 100644
--- a/libgnome-desktop/libgnomeui/gnome-rr-labeler.h
+++ b/libgnome-desktop/gnome-rr-labeler.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))
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index fecd24b6..7e8bc22f 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -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"
diff --git a/libgnome-desktop/libgnomeui/gnome-rr.h b/libgnome-desktop/gnome-rr.h
index 0cdf19e5..0cdf19e5 100644
--- a/libgnome-desktop/libgnomeui/gnome-rr.h
+++ b/libgnome-desktop/gnome-rr.h
diff --git a/libgnome-desktop/gnome-thumbnail-pixbuf-utils.c b/libgnome-desktop/gnome-thumbnail-pixbuf-utils.c
index 7256a5c0..833242a6 100644
--- a/libgnome-desktop/gnome-thumbnail-pixbuf-utils.c
+++ b/libgnome-desktop/gnome-thumbnail-pixbuf-utils.c
@@ -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
 
diff --git a/libgnome-desktop/libgnome/Makefile.am b/libgnome-desktop/libgnome/Makefile.am
deleted file mode 100644
index 5edb95ed..00000000
--- a/libgnome-desktop/libgnome/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-libgnome_desktopdir = $(includedir)/gnome-desktop-3.0/libgnome
-libgnome_desktop_HEADERS = \
-	gnome-desktop-utils.h
-
--include $(top_srcdir)/git.mk
diff --git a/libgnome-desktop/libgnomeui/Makefile.am b/libgnome-desktop/libgnomeui/Makefile.am
deleted file mode 100644
index f8ef7bdf..00000000
--- a/libgnome-desktop/libgnomeui/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-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