don't define G_DISABLE_SINGLE_INCLUDES, it's in the global CPPFLAGS now.

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

	* Makefile.am: don't define G_DISABLE_SINGLE_INCLUDES, it's in
	the global CPPFLAGS now.

	* tests/data-input-stream.c
	* tests/data-output-stream.c
	* tests/g-file-info.c
	* tests/g-file.c
	* tests/live-g-file.c
	* tests/memory-input-stream.c: don't include <glib/gtestutils.h>

svn path=/trunk/; revision=6954

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 62226cc..6c20add 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-28  Michael Natterer  <mitch@imendio.com>
+
+       * Makefile.am: don't define G_DISABLE_SINGLE_INCLUDES, it's in
+       the global CPPFLAGS now.
+
+       * tests/data-input-stream.c
+       * tests/data-output-stream.c
+       * tests/g-file-info.c
+       * tests/g-file.c
+       * tests/live-g-file.c
+       * tests/memory-input-stream.c: don't include <glib/gtestutils.h>
+
 2008-05-27  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.17.0 ===

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 08e0659..7e27a2f 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -49,7 +49,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/gmodule                         \
        $(GLIB_DEBUG_FLAGS)                             \
        -DG_DISABLE_DEPRECATED                          \
-       -DG_DISABLE_SINGLE_INCLUDES                     \
        -DGIO_COMPILATION                               \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  
 

diff --git a/gio/tests/data-input-stream.c b/gio/tests/data-input-stream.c
index 6abc7c4..ca8d725 100644 (file)
--- a/gio/tests/data-input-stream.c
+++ b/gio/tests/data-input-stream.c
@@ -19,7 +19,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
 #include <glib/glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>

diff --git a/gio/tests/data-output-stream.c b/gio/tests/data-output-stream.c
index 1a7e1ae..52ce4a8 100644 (file)
--- a/gio/tests/data-output-stream.c
+++ b/gio/tests/data-output-stream.c
@@ -19,7 +19,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
 #include <glib/glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>

diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c
index d3ed5c9..80bdd6e 100644 (file)
--- a/gio/tests/g-file-info.c
+++ b/gio/tests/g-file-info.c
@@ -19,7 +19,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
 #include <glib/glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>

diff --git a/gio/tests/g-file.c b/gio/tests/g-file.c
index d512c93..4becc1d 100644 (file)
--- a/gio/tests/g-file.c
+++ b/gio/tests/g-file.c
@@ -19,7 +19,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
 #include <glib/glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>

diff --git a/gio/tests/live-g-file.c b/gio/tests/live-g-file.c
index 19afff7..bd91ce9 100644 (file)
--- a/gio/tests/live-g-file.c
+++ b/gio/tests/live-g-file.c
@@ -20,7 +20,6 @@
  * if advised of the possibility of such damage.
  */
 
-#include <glib/gtestutils.h>
 #include <glib/glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>

diff --git a/gio/tests/memory-input-stream.c b/gio/tests/memory-input-stream.c
index 247613c..7f289c1 100644 (file)
--- a/gio/tests/memory-input-stream.c
+++ b/gio/tests/memory-input-stream.c
@@ -19,7 +19,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
 #include <glib/glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>