Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent code from

2008-05-05  Michael Natterer  <mitch@imendio.com>

	* Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent
	code from being checked in that breaks the build of applications
	which use G_DISABLE_SINGLE_INCLUDES.

	* makegioalias.pl: make the alias file include "glib.h" instead of
	"glibconfig.h".

	* gio.symbols: whitespace change to force regeneration of the
	alias file after above script change.

	* gfileinfo.h: remove inlcusion of <glib/gfileutils.h>.

	* gfilenamecompleter.c: remove inclusion of "gurifuncs.h".

	* gioerror.h: #include <glib.h> instead of <glib/gerror.h>.

	* glocalfileinfo.c: remove inclusion of <glib/gchecksum>.


svn path=/trunk/; revision=6879
This commit is contained in:
Michael Natterer 2008-05-05 15:12:13 +00:00 committed by Michael Natterer
parent 62c4c3e2da
commit d922bf632a
8 changed files with 24 additions and 5 deletions

View File

@ -1,3 +1,23 @@
2008-05-05 Michael Natterer <mitch@imendio.com>
* Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent
code from being checked in that breaks the build of applications
which use G_DISABLE_SINGLE_INCLUDES.
* makegioalias.pl: make the alias file include "glib.h" instead of
"glibconfig.h".
* gio.symbols: whitespace change to force regeneration of the
alias file after above script change.
* gfileinfo.h: remove inlcusion of <glib/gfileutils.h>.
* gfilenamecompleter.c: remove inclusion of "gurifuncs.h".
* gioerror.h: #include <glib.h> instead of <glib/gerror.h>.
* glocalfileinfo.c: remove inclusion of <glib/gchecksum>.
2008-04-28 David Zeuthen <davidz@redhat.com>
* gunixmounts.c (g_unix_mount_guess_should_display): Avoid

View File

@ -49,6 +49,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/gmodule \
$(GLIB_DEBUG_FLAGS) \
-DG_DISABLE_DEPRECATED \
-DG_DISABLE_SINGLE_INCLUDES \
-DGIO_COMPILATION \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"

View File

@ -28,7 +28,6 @@
#define __G_FILE_INFO_H__
#include <glib-object.h>
#include <glib/gfileutils.h>
#include <gio/gfileattribute.h>
#include <gio/gicon.h>

View File

@ -22,7 +22,6 @@
#include <config.h>
#include "gfilenamecompleter.h"
#include "gurifuncs.h"
#include "gfile.h"
#include <string.h>
#include "glibintl.h"

View File

@ -7,6 +7,7 @@
* #ifdef IN_HEADER(sym) #endif and
* #ifdef IN_FILE(sym) #endif sections.
*/
#ifdef ALL_FILES
#define IN_FILE(x) 1
#define IN_HEADER(x) 1

View File

@ -27,7 +27,7 @@
#ifndef __G_IO_ERROR_H__
#define __G_IO_ERROR_H__
#include <glib/gerror.h>
#include <glib.h>
G_BEGIN_DECLS

View File

@ -58,7 +58,6 @@
#endif /* HAVE_XATTR */
#include <glib/gstdio.h>
#include <glib/gchecksum.h>
#include <gfileattribute-priv.h>
#include "glibintl.h"

View File

@ -12,7 +12,7 @@ print <<EOF;
#ifndef DISABLE_VISIBILITY
#include "glibconfig.h"
#include "glib.h"
#ifdef G_HAVE_GNUC_VISIBILITY