GNOME.org
 

[gtk+] Use AM_CPPFLAGS instead the obsolete INCLUDES

commit 32e00d1f43e1ff65f77b3c6d904f93510acbf89e
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon May 16 12:47:17 2011 +0100

    Use AM_CPPFLAGS instead the obsolete INCLUDES

 demos/gtk-demo/Makefile.am              |    2 +-
 demos/pixbuf-demo/Makefile.am           |    2 +-
 docs/reference/gdk/Makefile.am          |    2 +-
 docs/reference/gtk/Makefile.am          |    2 +-
 docs/reference/libgail-util/Makefile.am |    2 +-
 docs/tools/Makefile.am                  |    2 +-
 examples/Makefile.am                    |    2 +-
 gdk/Makefile.am                         |    6 +++---
 gdk/broadway/Makefile.am                |    2 +-
 gdk/quartz/Makefile.am                  |    2 +-
 gdk/wayland/Makefile.am                 |    2 +-
 gdk/win32/Makefile.am                   |    2 +-
 gdk/x11/Makefile.am                     |    2 +-
 gtk/Makefile.am                         |    6 +++---
 gtk/tests/Makefile.am                   |    2 +-
 modules/engines/ms-windows/Makefile.am  |    2 +-
 modules/engines/pixbuf/Makefile.am      |    2 +-
 modules/printbackends/cups/Makefile.am  |    2 +-
 modules/printbackends/lpr/Makefile.am   |    2 +-
 modules/printbackends/papi/Makefile.am  |    2 +-
 perf/Makefile.am                        |    2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index e4c4553..9733078 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -46,7 +46,7 @@ demos =						\
 	tree_store.c				\
 	ui_manager.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DDEMOCODEDIR="\"$(democodedir)\""	\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
diff --git a/demos/pixbuf-demo/Makefile.am b/demos/pixbuf-demo/Makefile.am
index ca520ce..c5c5aaa 100644
--- a/demos/pixbuf-demo/Makefile.am
+++ b/demos/pixbuf-demo/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-I$(top_srcdir) 		\
 	-I$(top_builddir)/gdk		\
 	-DGDK_DISABLE_DEPRECATED	\
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 8f4ad9e..aab34e3 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_HFILES=			\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/gdk	\
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 7c80efe..153ecfc 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -94,7 +94,7 @@ IGNORE_HFILES=				\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	-I$(top_builddir)/gdk	\
diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am
index 8c30e2d..b26dd5c 100644
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@@ -17,7 +17,7 @@ CFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.c
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =                      \
+AM_CPPFLAGS =                   \
         -I$(top_srcdir)         \
         -I$(top_builddir)       \
         $(DEP_CFLAGS)
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 03bef71..e3b2966 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk		\
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8ef4e6d..011e5a5 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -35,7 +35,7 @@ OLD_EXAMPLES = \
 		tictactoe \
 		wheelbarrow
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/gdk			\
 	-I$(top_builddir)/gdk			\
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 9f4a570..5ac401b 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST += 			\
 	gdkenumtypes.h.template	\
 	abicheck.sh
 
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\
@@ -195,7 +195,7 @@ Gdk_3_0_gir_SCANNERFLAGS = 	\
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
 Gdk_3_0_gir_LIBS = libgdk-3.la
 Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
 INTROSPECTION_GIRS += Gdk-3.0.gir
 
@@ -248,7 +248,7 @@ GdkX11_3_0_gir_SCANNERFLAGS = 		\
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = libgdk-3.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
-GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
+GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
 INTROSPECTION_GIRS += GdkX11-3.0.gir
 
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index 3c58e1e..423c243 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
 
-INCLUDES =			\
+AM_CPPFLAGS =			\
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DGDK_COMPILATION	\
 	-I$(top_srcdir)		\
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 9b21353..a8be38e 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
 
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index 4681dc9..0169593 100644
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"Gdk\"			\
 	-DGDK_COMPILATION			\
 	-I$(top_srcdir)				\
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 404ddd6..9b4d3ee 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DINSIDE_GDK_WIN32	\
 	-I$(top_srcdir)		\
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6aea001..6e10b49 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
 
-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DGDK_COMPILATION	\
 	-I$(top_srcdir)		\
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e532bda..992f9cb 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -32,7 +32,7 @@ endif
 endif
 endif
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"Gtk\"				\
 	-DGTK_LIBDIR=\"$(libdir)\"			\
 	-DGTK_DATADIR=\"$(datadir)\"			\
@@ -894,7 +894,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 
 gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
 	$(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
-	  ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
 	  $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
 	  sort | uniq | \
 	  $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
@@ -1018,7 +1018,7 @@ endif
 Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
 Gtk_3_0_gir_INCLUDES = Atk-1.0
 Gtk_3_0_gir_CFLAGS = \
-		$(INCLUDES) \
+		$(AM_CPPFLAGS) \
 		-UGDK_DISABLE_DEPRECATED \
 		-UGTK_DISABLE_DEPRECATED \
 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 8b2e131..528abd8 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS =
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk		\
diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index de4562b..fd0a40e 100644
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS=Theme
 
 EXTRA_DIST += Makefile.msc
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index 2a90796..59a280c 100644
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 665657a..f90a28f 100644
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gtk				\
 	-I$(top_builddir)/gtk				\
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 3823652..ff51351 100644
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gtk				\
 	-I$(top_builddir)/gtk				\
diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index 9d7109d..5388baa 100644
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -2,7 +2,7 @@ if OS_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gtk				\
 	-I$(top_builddir)/gtk				\
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 799b748..6bb0ce7 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/perf
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =				\
+AM_CPPFLAGS =				\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]