libgimp/Makefile.am (GTKDOC_CFLAGS) undef GTK_DISABLE_SINGLE_INCLUDES and

2008-05-30  Michael Natterer  <mitch@gimp.org>

	* libgimp/Makefile.am (GTKDOC_CFLAGS)
	* libgimpwidgets/Makefile.am (GTKDOC_CFLAGS): undef
	GTK_DISABLE_SINGLE_INCLUDES and GIMP_DISABLE_DEPRECATED here.

	* libgimpwidgets/libgimpwidgets.types: don't try to #define or
	#undef anything here.


svn path=/trunk/; revision=25869

devel-docs/libgimpwidgets/Makefile.am

@@ -46,11 +46,13 @@ extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
-	@CFLAGS@		\
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	@GTK_CFLAGS@		\
-	-DGIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+	@CFLAGS@					\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	@GTK_CFLAGS@					\
+	-DGIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION	\
+	-UGTK_DISABLE_SINGLE_INCLUDES			\
+	-UGIMP_DISABLE_DEPRECATED
 
 GTKDOC_LIBS = \
 	$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la		\

devel-docs/libgimpwidgets/libgimpwidgets.types

@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>
-#undef GIMP_DISABLE_DEPRECATED
 #include <libgimpwidgets/gimpwidgets.h>
 #include <libgimpwidgets/gimpcontroller.h>