gimp r25869 - in trunk/devel-docs: . libgimp libgimpwidgets

[mitch svn gnome org]

Author: mitch
Date: Fri May 30 10:48:56 2008
New Revision: 25869
URL: http://svn.gnome.org/viewvc/gimp?rev=25869&view=rev

Log:
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.



Modified:
   trunk/devel-docs/ChangeLog
   trunk/devel-docs/libgimp/Makefile.am
   trunk/devel-docs/libgimpwidgets/Makefile.am
   trunk/devel-docs/libgimpwidgets/libgimpwidgets.types

Modified: trunk/devel-docs/libgimp/Makefile.am
==============================================================================
--- trunk/devel-docs/libgimp/Makefile.am	(original)
+++ trunk/devel-docs/libgimp/Makefile.am	Fri May 30 10:48:56 2008
@@ -47,16 +47,17 @@
 	@CFLAGS@		\
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
-	@GTK_CFLAGS@
+	@GTK_CFLAGS@		\
+	-UGTK_DISABLE_SINGLE_INCLUDES
 
 GTKDOC_LIBS = \
-        $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la        \
-        $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la      \
-        $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la        \
-        $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la        \
-        $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la  \
-        $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la		      \
-        $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la	      \
+	$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la		\
+	$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la	\
+	$(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la		\
+	$(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la	\
+	$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la	\
+	$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la			\
+	$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la		\
 	@GTK_LIBS@
 
 

Modified: trunk/devel-docs/libgimpwidgets/Makefile.am
==============================================================================
--- trunk/devel-docs/libgimpwidgets/Makefile.am	(original)
+++ trunk/devel-docs/libgimpwidgets/Makefile.am	Fri May 30 10:48:56 2008
@@ -46,11 +46,13 @@
 # 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		\

Modified: trunk/devel-docs/libgimpwidgets/libgimpwidgets.types
==============================================================================
--- trunk/devel-docs/libgimpwidgets/libgimpwidgets.types	(original)
+++ trunk/devel-docs/libgimpwidgets/libgimpwidgets.types	Fri May 30 10:48:56 2008
@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>
-#undef GIMP_DISABLE_DEPRECATED
 #include <libgimpwidgets/gimpwidgets.h>
 #include <libgimpwidgets/gimpcontroller.h>