Updating branch refs/heads/nick/abi-changes
to 09e3bc79fc38046b30d13da37d59dc3e9c8f6921 (commit)
from 18fcca957cb117b19d2c6f33a5ece3e7e823ead9 (commit)
commit 09e3bc79fc38046b30d13da37d59dc3e9c8f6921
Author: Nick Schermer <[email protected]>
Date: Fri Jun 10 21:10:44 2011 +0200
Only link against glib.
configure.in.in | 8 ++++----
docs/Makefile.am | 20 ++------------------
docs/libxfce4util.types | 2 --
libxfce4util/Makefile.am | 4 ++--
libxfce4util/xfce-private.h | 24 +-----------------------
xfce4-kiosk-query/Makefile.am | 2 +-
6 files changed, 10 insertions(+), 50 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 9d58263..7bb3cc1 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -107,10 +107,10 @@ dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([@LINGUAS@])
-dnl *********************************************************************
-dnl *** Check for GObject installed (GObject in turn depends on GLib) ***
-dnl *********************************************************************
-XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.12.0])
+dnl ********************************
+dnl *** Check for GLib installed ***
+dnl ********************************
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
dnl *************************
dnl *** Check for gtk-doc ***
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e926c66..706171d 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -36,28 +36,12 @@ EXTRA_HFILES=
HTML_IMAGES =
# Extra SGML files that are included by DOC_MAIN_SGML_FILE
-content_files = \
- version.xml
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -DLIBXFCE4UTIL_COMPILATION \
- $(CPPFLAGS) \
- $(GOBJECT_CFLAGS) \
- $(GTK_DOC_EXTRA_CFLAGS)
-
-GTKDOC_LIBS = \
- $(GOBJECT_LIBS) \
- $(top_builddir)/libxfce4util/libxfce4util.la
+content_files = version.xml
include $(top_srcdir)/gtk-doc.make
# Other files to distribute
-EXTRA_DIST += \
- version.xml.in
+EXTRA_DIST += version.xml.in
if MAINTAINER_MODE
%.1: %.xml
diff --git a/docs/libxfce4util.types b/docs/libxfce4util.types
deleted file mode 100644
index 8290081..0000000
--- a/docs/libxfce4util.types
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libxfce4util/libxfce4util.h>
-
diff --git a/libxfce4util/Makefile.am b/libxfce4util/Makefile.am
index 82425cd..59b4174 100644
--- a/libxfce4util/Makefile.am
+++ b/libxfce4util/Makefile.am
@@ -63,7 +63,7 @@ libxfce4util_la_SOURCES =
\
xfce-utf8.c
libxfce4util_la_CFLAGS = \
- $(GOBJECT_CFLAGS)
+ $(GLIB_CFLAGS)
libxfce4util_la_LDFLAGS = \
-export-dynamic \
@@ -72,7 +72,7 @@ libxfce4util_la_LDFLAGS =
\
-no-undefined
libxfce4util_la_LIBADD = \
- $(GOBJECT_LIBS)
+ $(GLIB_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxfce4util-1.0.pc
diff --git a/libxfce4util/xfce-private.h b/libxfce4util/xfce-private.h
index 7899d2d..c6b3c85 100644
--- a/libxfce4util/xfce-private.h
+++ b/libxfce4util/xfce-private.h
@@ -26,7 +26,7 @@
#ifndef __XFCE_PRIVATE_H__
#define __XFCE_PRIVATE_H__
-#include <glib-object.h>
+#include <glib.h>
G_BEGIN_DECLS
@@ -60,28 +60,6 @@ G_BEGIN_DECLS
#define _xfce_slice_free(type, ptr) G_STMT_START{ g_free
((ptr)); }G_STMT_END
#endif
-/* avoid trivial g_value_get_*() function calls */
-#ifdef NDEBUG
-#define g_value_get_boolean(v) (((const GValue *) (v))->data[0].v_int)
-#define g_value_get_char(v) (((const GValue *) (v))->data[0].v_int)
-#define g_value_get_uchar(v) (((const GValue *) (v))->data[0].v_uint)
-#define g_value_get_int(v) (((const GValue *) (v))->data[0].v_int)
-#define g_value_get_uint(v) (((const GValue *) (v))->data[0].v_uint)
-#define g_value_get_long(v) (((const GValue *) (v))->data[0].v_long)
-#define g_value_get_ulong(v) (((const GValue *) (v))->data[0].v_ulong)
-#define g_value_get_int64(v) (((const GValue *) (v))->data[0].v_int64)
-#define g_value_get_uint64(v) (((const GValue *) (v))->data[0].v_uint64)
-#define g_value_get_enum(v) (((const GValue *) (v))->data[0].v_long)
-#define g_value_get_flags(v) (((const GValue *) (v))->data[0].v_ulong)
-#define g_value_get_float(v) (((const GValue *) (v))->data[0].v_float)
-#define g_value_get_double(v) (((const GValue *) (v))->data[0].v_double)
-#define g_value_get_string(v) (((const GValue *) (v))->data[0].v_pointer)
-#define g_value_get_param(v) (((const GValue *) (v))->data[0].v_pointer)
-#define g_value_get_boxed(v) (((const GValue *) (v))->data[0].v_pointer)
-#define g_value_get_pointer(v) (((const GValue *) (v))->data[0].v_pointer)
-#define g_value_get_object(v) (((const GValue *) (v))->data[0].v_pointer)
-#endif
-
G_END_DECLS
#endif /* !__XFCE_RC_H__ */
diff --git a/xfce4-kiosk-query/Makefile.am b/xfce4-kiosk-query/Makefile.am
index 7b53e55..e35e7ef 100644
--- a/xfce4-kiosk-query/Makefile.am
+++ b/xfce4-kiosk-query/Makefile.am
@@ -9,7 +9,7 @@ xfce4_kiosk_query_SOURCES =
\
main.c
xfce4_kiosk_query_CFLAGS = \
- $(GOBJECT_CFLAGS)
+ $(GLIB_CFLAGS)
xfce4_kiosk_query_DEPENDENCIES = \
$(top_builddir)/libxfce4util/libxfce4util.la
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
