build: replace deprecated INCLUDES with AM_CPPFLAGS

2026-04-28 21:14:00 +02:00 · 2026-04-28 21:14:00 +02:00 · 81b9e0200f
commit 81b9e0200f
parent 97aac40bd2
22 changed files with 36 additions and 26 deletions
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl

 SUBDIRS = gtk-demo

-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-I$(top_srcdir) 		\
 	-I$(top_builddir)/gdk		\
 	-DGDK_DISABLE_DEPRECATED	\
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@ -45,7 +45,7 @@ demos =						\
 	tree_store.c				\
 	ui_manager.c

-INCLUDES = \
+AM_CPPFLAGS = \
 	-DDEMOCODEDIR="\"$(democodedir)\""	\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@ -41,7 +41,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 	\
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@ -97,7 +97,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	\
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@ -18,7 +18,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)
--- 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				\
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@ -33,7 +33,7 @@ EXTRA_DIST +=			\
 	abicheck.sh		\
 	pltcheck.sh

-INCLUDES =                              \
+AM_CPPFLAGS =                              \
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\
--- a/gdk/directfb/Makefile.am
+++ b/gdk/directfb/Makefile.am
@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl

 libgdkincludedir = $(includedir)/gtk-2.0/gdk

-INCLUDES = 		\
+AM_CPPFLAGS = 		\
 	-DG_LOG_DOMAIN=\"Gdk-DirectFB\"	\
 	-DGDK_COMPILATION \
 	-I$(top_srcdir)			\
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl

 libgdkincludedir = $(includedir)/gtk-2.0/gdk

-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl

 libgdkincludedir = $(includedir)/gtk-2.0/gdk

-INCLUDES = \
+AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DINSIDE_GDK_WIN32	\
 	-I$(top_srcdir)		\
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl

 libgdkincludedir = $(includedir)/gtk-2.0/gdk

-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DGDK_COMPILATION	\
 	-I$(top_srcdir)		\
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@ -50,7 +50,7 @@ GTK_PLAT_CFLAGS_DEFINES =				\
 	-DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"	\
 	-DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\"

-INCLUDES =						\
+AM_CPPFLAGS =						\
 	$(GTK_BASE_CFLAGS_DEFINES)			\
 	$(GTK_PLAT_CFLAGS_DEFINES)			\
 	-DG_LOG_DOMAIN=\"Gtk\"				\
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/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		\
--- a/gtk/theme-bits/Makefile.am
+++ b/gtk/theme-bits/Makefile.am
@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl

-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	 -I$(top_builddir) 	\
 	$(BASE_DEPENDENCIES_CFLAGS)
--- 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		\
--- 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		\
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@ -5,7 +5,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif

-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
@ -154,7 +154,9 @@ IME_MODULE=im-ime.la
 endif
 endif

-im_quartz_la_CPPFLAGS = -xobjective-c
+im_quartz_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-xobjective-c
 im_quartz_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_quartz_la_SOURCES = imquartz.c
 libstatic_im_quartz_la_SOURCES = $(im_quartz_la_SOURCES)
@ -167,8 +169,14 @@ QUARTZ_MODULE = im-quartz.la
 endif
 endif

-multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
-im_multipress_la_CPPFLAGS = $(multipress_defs)
+multipress_defs = \
+	-DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" \
+	-DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
+
+im_multipress_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(multipress_defs)
+
 libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
 im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_multipress_la_SOURCES =	\
--- 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				\
--- 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				\
--- 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				\
--- 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		\
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/tests
 include $(top_srcdir)/Makefile.decl

-INCLUDES =				\
+AM_CPPFLAGS =				\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk		\
@ -95,7 +95,9 @@ noinst_PROGRAMS += autotestkeywords
 TESTS = autotestkeywords

 autotestkeywords_SOURCES = autotestkeywords.cc
-autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
+autotestkeywords_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(srcdir)/dummy-headers

 if HAVE_OBJC
 autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++