summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2009-03-19 20:18:42 +0000
committerChristian Persch <chpe@src.gnome.org>2009-03-19 20:18:42 +0000
commit0448d1936b347f631b14bed14c78268709ed3e2a (patch)
tree6c47712c1c267b8774f5902e4ca77cc90cc67bde
parent0cc2ca416d789eb1dea6078f98f0db68b08e029a (diff)
downloadshared-mime-info-0448d1936b347f631b14bed14c78268709ed3e2a.tar.gz
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
-rw-r--r--macros2/gnome-common.m48
1 files changed, 3 insertions, 5 deletions
diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 8e03d4f3..21f3ef1a 100644
--- 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)
])