From eed2153eb0f82d868ec84bdc8d0fadda05d50b16 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 31 Oct 2008 23:58:34 +0000 Subject: [PATCH] (gtk) #1401: libverify's headers break when -DGTK_DISABLE_SINGLE_INCLUDES is defined, so don't define it... --- gtk/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 3823467c8..939acd8cf 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,9 +1,12 @@ SUBDIRS = icons if TR_UNSTABLE -GTK_EXTRA_CPPFLAGS=-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES +GTK_EXTRA_CPPFLAGS=-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED endif +# these should go in GTK_EXTRA_CPPFLAGS at some point, but not yet because it breaks libnotify's headers +# -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES + sexy-marshal.h: marshal.list glib-genmarshal --prefix=sexy_marshal ./marshal.list --header > sexy-marshal.h