GNOME.org
 

gtk+ r21096 - in trunk: . contrib/gdk-pixbuf-xlib demos demos/gtk-demo gdk gdk-pixbuf gdk-pixbuf/pixops gdk/x11 gtk gtk/tests gtk/theme-bits modules/engines/ms-windows modules/engines/pixbuf modules/input perf tests

Author: mitch
Date: Tue Aug 12 15:04:55 2008
New Revision: 21096
URL: http://svn.gnome.org/viewvc/gtk+?rev=21096&view=rev

Log:
2008-08-12  Michael Natterer  <mitch imendio com>

	* configure.in: define -DGDK_PIXBUF_DISABLE_DEPRECATED in the
	global CFLAGS.

	* gdk-pixbuf/Makefile.am: make the contents gdk-pixbuf-marshal.h
	visible for GDK_PIXBUF_COMPILATION.

	* contrib/gdk-pixbuf-xlib/Makefile.am
	* demos/Makefile.am
	* demos/gtk-demo/Makefile.am
	* gdk-pixbuf/pixops/Makefile.am
	* gdk/Makefile.am
	* gdk/x11/Makefile.am
	* gtk/Makefile.am
	* gtk/tests/Makefile.am
	* gtk/theme-bits/Makefile.am
	* modules/engines/ms-windows/Makefile.am
	* modules/engines/pixbuf/Makefile.am
	* modules/input/Makefile.am
	* perf/Makefile.am
	* tests/Makefile.am: remove -DDGDK_PIXBUF_DISABLE_DEPRECATED here.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/contrib/gdk-pixbuf-xlib/Makefile.am
   trunk/demos/Makefile.am
   trunk/demos/gtk-demo/Makefile.am
   trunk/gdk-pixbuf/Makefile.am
   trunk/gdk-pixbuf/pixops/Makefile.am
   trunk/gdk/Makefile.am
   trunk/gdk/x11/Makefile.am
   trunk/gtk/Makefile.am
   trunk/gtk/tests/Makefile.am
   trunk/gtk/theme-bits/Makefile.am
   trunk/modules/engines/ms-windows/Makefile.am
   trunk/modules/engines/pixbuf/Makefile.am
   trunk/modules/input/Makefile.am
   trunk/perf/Makefile.am
   trunk/tests/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Aug 12 15:04:55 2008
@@ -583,6 +583,8 @@
   CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
 fi
 
+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+
 
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.

Modified: trunk/contrib/gdk-pixbuf-xlib/Makefile.am
==============================================================================
--- trunk/contrib/gdk-pixbuf-xlib/Makefile.am	(original)
+++ trunk/contrib/gdk-pixbuf-xlib/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -10,7 +10,6 @@
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_srcdir)/contrib 		\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \

Modified: trunk/demos/Makefile.am
==============================================================================
--- trunk/demos/Makefile.am	(original)
+++ trunk/demos/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -3,13 +3,12 @@
 
 SUBDIRS = gtk-demo
 
-INCLUDES = 						\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir)/gdk				\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED			\
-	$(GTK_DEBUG_FLAGS)				\
+INCLUDES = 				\
+	-I$(top_srcdir) 		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)
 
 DEPS = 									\

Modified: trunk/demos/gtk-demo/Makefile.am
==============================================================================
--- trunk/demos/gtk-demo/Makefile.am	(original)
+++ trunk/demos/gtk-demo/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -38,13 +38,12 @@
 	ui_manager.c
 
 INCLUDES = \
-	-DDEMOCODEDIR="\"$(democodedir)\""		\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir)/gdk				\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED 			\
-	$(GTK_DEBUG_FLAGS)				\
+	-DDEMOCODEDIR="\"$(democodedir)\""	\
+	-I$(top_srcdir) 			\
+	-I$(top_builddir)/gdk			\
+	-DGDK_DISABLE_DEPRECATED		\
+	-DGTK_DISABLE_DEPRECATED 		\
+	$(GTK_DEBUG_FLAGS)			\
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \

Modified: trunk/gdk-pixbuf/Makefile.am
==============================================================================
--- trunk/gdk-pixbuf/Makefile.am	(original)
+++ trunk/gdk-pixbuf/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -628,9 +628,9 @@
 	@true
 
 stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-	echo "#ifndef GDK_PIXBUF_DISABLE_DEPRECATED" > xgen-gmh \
+	echo "#if !defined(GDK_PIXBUF_DISABLE_DEPRECATED) || defined(GDK_PIXBUF_COMPILATION)" > xgen-gmh \
 	&& $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
-	&& echo "#endif /* GDK_PIXBUF_DISABLE_DEPRECATED */" >> xgen-gmh \
+	&& echo "#endif /* !GDK_PIXBUF_DISABLE_DEPRECATED || GDK_PIXBUF_COMPILATION */" >> xgen-gmh \
 	&& (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
 	&& rm -f xgen-gmh xgen-gmh~ \
 	&& echo timestamp > $(@F)

Modified: trunk/gdk-pixbuf/pixops/Makefile.am
==============================================================================
--- trunk/gdk-pixbuf/pixops/Makefile.am	(original)
+++ trunk/gdk-pixbuf/pixops/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -5,8 +5,7 @@
 INCLUDES = \
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	$(GTK_DEBUG_FLAGS)			\
-	$(GDK_PIXBUF_DEP_CFLAGS)		\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED
+	$(GDK_PIXBUF_DEP_CFLAGS)
 
 noinst_PROGRAMS = timescale
 

Modified: trunk/gdk/Makefile.am
==============================================================================
--- trunk/gdk/Makefile.am	(original)
+++ trunk/gdk/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -28,7 +28,6 @@
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk-pixbuf 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
 	$(GTK_DEBUG_FLAGS) 		\
 	$(GDK_DEP_CFLAGS)
 

Modified: trunk/gdk/x11/Makefile.am
==============================================================================
--- trunk/gdk/x11/Makefile.am	(original)
+++ trunk/gdk/x11/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -3,14 +3,13 @@
 
 libgdkincludedir = $(includedir)/gtk-2.0/gdk
 
-INCLUDES = 				\
-	-DG_LOG_DOMAIN=\"Gdk\"		\
-	-DGDK_COMPILATION		\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
-	$(GTK_DEBUG_FLAGS) 		\
+INCLUDES = 			\
+	-DG_LOG_DOMAIN=\"Gdk\"	\
+	-DGDK_COMPILATION	\
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/gdk	\
+	-I$(top_builddir)/gdk	\
+	$(GTK_DEBUG_FLAGS) 	\
 	$(GDK_DEP_CFLAGS)
 
 LDADDS = $(GDK_DEP_LIBS)

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -33,7 +33,6 @@
 	-I$(top_srcdir) -I../gdk			\
 	-I$(top_srcdir)/gdk				\
 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED			\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\

Modified: trunk/gtk/tests/Makefile.am
==============================================================================
--- trunk/gtk/tests/Makefile.am	(original)
+++ trunk/gtk/tests/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -4,7 +4,6 @@
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk		\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGDK_DISABLE_DEPRECATED	\
 	-DGTK_DISABLE_DEPRECATED	\
 	$(GTK_DEBUG_FLAGS)		\

Modified: trunk/gtk/theme-bits/Makefile.am
==============================================================================
--- trunk/gtk/theme-bits/Makefile.am	(original)
+++ trunk/gtk/theme-bits/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -1,7 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
+INCLUDES = \
+	-I$(top_srcdir)		\
+	 -I$(top_builddir) 	\
 	$(GDK_PIXBUF_DEP_CFLAGS)
 
 noinst_PROGRAMS = decompose-bits

Modified: trunk/modules/engines/ms-windows/Makefile.am
==============================================================================
--- trunk/modules/engines/ms-windows/Makefile.am	(original)
+++ trunk/modules/engines/ms-windows/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -5,11 +5,10 @@
 EXTRA_DIST += Makefile.msc
 
 INCLUDES = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGDK_DISABLE_DEPRECATED			\
+	-I$(top_srcdir) 		\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
 	$(GTK_DEP_CFLAGS)
 
 

Modified: trunk/modules/engines/pixbuf/Makefile.am
==============================================================================
--- trunk/modules/engines/pixbuf/Makefile.am	(original)
+++ trunk/modules/engines/pixbuf/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -5,11 +5,10 @@
 endif
 
 INCLUDES = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGDK_DISABLE_DEPRECATED			\
+	-I$(top_srcdir) 		\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
 	$(GTK_DEP_CFLAGS)
 
 LDADDS = \

Modified: trunk/modules/input/Makefile.am
==============================================================================
--- trunk/modules/input/Makefile.am	(original)
+++ trunk/modules/input/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -6,15 +6,14 @@
 endif
 
 INCLUDES = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED 			\
-	$(GTK_DEBUG_FLAGS)				\
-	$(GTK_XIM_FLAGS)				\
-	$(GTK_DEP_CFLAGS)				\
+	-I$(top_srcdir) 		\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED 	\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_XIM_FLAGS)		\
+	$(GTK_DEP_CFLAGS)		\
 	$(INCLUDED_IMMODULE_DEFINE)
 
 DEPS = \

Modified: trunk/perf/Makefile.am
==============================================================================
--- trunk/perf/Makefile.am	(original)
+++ trunk/perf/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -1,14 +1,13 @@
 ## Makefile.am for gtk+/perf
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_builddir)/gdk			\
-	-I$(top_srcdir)/gdk			\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGTK_DISABLE_DEPRECATED		\
-	$(GTK_DEBUG_FLAGS)			\
+INCLUDES =				\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/gdk		\
+	-I$(top_srcdir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)
 
 DEPS =									\

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Tue Aug 12 15:04:55 2008
@@ -1,14 +1,13 @@
 ## Makefile.am for gtk+/tests
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_builddir)/gdk			\
-	-I$(top_srcdir)/gdk			\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGTK_DISABLE_DEPRECATED		\
-	$(GTK_DEBUG_FLAGS)			\
+INCLUDES =				\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/gdk		\
+	-I$(top_srcdir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)
 
 DEPS =									\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]