Revert "Add single include disabling cppflags"

Oops, this wasn't meant to be committed just yet.

This reverts commit f95de3b4b636786d1e297f40df32ee32f71ebce7.

svn path=/trunk/; revision=3927

diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 8e03d4f..21f3ef1 100644 (file)
--- a/macros2/gnome-common.m4
+++ b/macros2/gnome-common.m4
@@ -38,12 +38,10 @@ AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
 [
        AC_REQUIRE([AM_MAINTAINER_MODE])
 
-        DISABLE_DEPRECATED=""
        if test $USE_MAINTAINER_MODE = yes; then
-               DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE WNCK LIBSOUP"
-               for DOMAIN in $DOMAINS; do
-                      DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-               done
+               DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
+       else
+               DISABLE_DEPRECATED=""
        fi
        AC_SUBST(DISABLE_DEPRECATED)
 ])