goocanvas r9 - in trunk: . demo src

[damon svn gnome org]

Author: damon
Date: Sun Aug 17 11:16:39 2008
New Revision: 9
URL: http://svn.gnome.org/viewvc/goocanvas?rev=9&view=rev

Log:

2008-08-17  Damon Chaplin  <damon gnome org>

	    * src/Makefile.am (INCLUDES): 
	    * demo/Makefile.am (INCLUDES): get rid of the XXX_DISABLE_DEPRECATED
	    flags so we don't break compilation when GTK+ deprecates stuff. #548086




Modified:
   trunk/ChangeLog
   trunk/demo/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/demo/Makefile.am
==============================================================================
--- trunk/demo/Makefile.am	(original)
+++ trunk/demo/Makefile.am	Sun Aug 17 11:16:39 2008
@@ -1,12 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED \
 	-I$(top_srcdir)/src \
 	@PACKAGE_CFLAGS@
 
+#	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
+#	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+#	-DGTK_DISABLE_DEPRECATED
+
 noinst_PROGRAMS = demo table-demo simple-demo scalability-demo units-demo widgets-demo mv-demo mv-table-demo mv-simple-demo mv-scalability-demo
 
 demo_SOURCES = \

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Aug 17 11:16:39 2008
@@ -1,14 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DG_LOG_DOMAIN=\"GooCanvas\" \
 	@PACKAGE_CFLAGS@
 
+#	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
+#	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+#	-DGTK_DISABLE_DEPRECATED
+
 lib_LTLIBRARIES = libgoocanvas.la
 
 libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)