daemonratte/gtk2-ng
Watch
1
0
Fork
You've already forked gtk2-ng
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: replace deprecated INCLUDES with AM_CPPFLAGS

Browse source
This commit is contained in:
Daemonratte 2026-04-28 21:14:00 +02:00
commit 81b9e0200f
22 changed files with 36 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
demos/Makefile.am
View file

@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS = gtk-demo SUBDIRS = gtk-demo
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \

2
demos/gtk-demo/Makefile.am
View file

@ -45,7 +45,7 @@ demos = \
tree_store.c \ tree_store.c \
ui_manager.c ui_manager.c
INCLUDES = \ AM_CPPFLAGS = \
-DDEMOCODEDIR="\"$(democodedir)\"" \ -DDEMOCODEDIR="\"$(democodedir)\"" \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \

2
docs/reference/gdk/Makefile.am
View file

@ -41,7 +41,7 @@ EXTRA_HFILES= \
# CFLAGS and LDFLAGS for compiling scan program. Only needed # CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty. # if $(DOC_MODULE).types is non-empty.
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \

2
docs/reference/gtk/Makefile.am
View file

@ -97,7 +97,7 @@ IGNORE_HFILES= \
# CFLAGS and LDFLAGS for compiling scan program. Only needed # CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty. # if $(DOC_MODULE).types is non-empty.
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \

2
docs/reference/libgail-util/Makefile.am
View file

@ -18,7 +18,7 @@ CFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.c
# CFLAGS and LDFLAGS for compiling scan program. Only needed # CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty. # if $(DOC_MODULE).types is non-empty.
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
$(DEP_CFLAGS) $(DEP_CFLAGS)

2
docs/tools/Makefile.am
View file

@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \

2
gdk/Makefile.am
View file

@ -33,7 +33,7 @@ EXTRA_DIST += \
abicheck.sh \ abicheck.sh \
pltcheck.sh pltcheck.sh
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \

2
gdk/directfb/Makefile.am
View file

@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-2.0/gdk libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \

2
gdk/quartz/Makefile.am
View file

@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-2.0/gdk libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \

2
gdk/win32/Makefile.am
View file

@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-2.0/gdk libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DINSIDE_GDK_WIN32 \ -DINSIDE_GDK_WIN32 \
-I$(top_srcdir) \ -I$(top_srcdir) \

2
gdk/x11/Makefile.am
View file

@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-2.0/gdk libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \

2
gtk/Makefile.am
View file

@ -50,7 +50,7 @@ GTK_PLAT_CFLAGS_DEFINES = \
-DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \
-DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\"
INCLUDES = \ AM_CPPFLAGS = \
$(GTK_BASE_CFLAGS_DEFINES) \ $(GTK_BASE_CFLAGS_DEFINES) \
$(GTK_PLAT_CFLAGS_DEFINES) \ $(GTK_PLAT_CFLAGS_DEFINES) \
-DG_LOG_DOMAIN=\"Gtk\" \ -DG_LOG_DOMAIN=\"Gtk\" \

2
gtk/tests/Makefile.am
View file

@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \

2
gtk/theme-bits/Makefile.am
View file

@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
$(BASE_DEPENDENCIES_CFLAGS) $(BASE_DEPENDENCIES_CFLAGS)

2
modules/engines/ms-windows/Makefile.am
View file

@ -4,7 +4,7 @@ SUBDIRS=Theme
EXTRA_DIST += Makefile.msc EXTRA_DIST += Makefile.msc
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \

2
modules/engines/pixbuf/Makefile.am
View file

@ -4,7 +4,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \

16
modules/input/Makefile.am
View file

@ -5,7 +5,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
@ -154,7 +154,9 @@ IME_MODULE=im-ime.la
endif endif
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_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_quartz_la_SOURCES = imquartz.c im_quartz_la_SOURCES = imquartz.c
libstatic_im_quartz_la_SOURCES = $(im_quartz_la_SOURCES) libstatic_im_quartz_la_SOURCES = $(im_quartz_la_SOURCES)
@ -167,8 +169,14 @@ QUARTZ_MODULE = im-quartz.la
endif endif
endif endif
multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" multipress_defs = \
im_multipress_la_CPPFLAGS = $(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) libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_multipress_la_SOURCES = \ im_multipress_la_SOURCES = \

2
modules/printbackends/cups/Makefile.am
View file

@ -4,7 +4,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gtk \ -I$(top_srcdir)/gtk \
-I$(top_builddir)/gtk \ -I$(top_builddir)/gtk \

2
modules/printbackends/lpr/Makefile.am
View file

@ -4,7 +4,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gtk \ -I$(top_srcdir)/gtk \
-I$(top_builddir)/gtk \ -I$(top_builddir)/gtk \

2
modules/printbackends/papi/Makefile.am
View file

@ -2,7 +2,7 @@ if OS_WIN32
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gtk \ -I$(top_srcdir)/gtk \
-I$(top_builddir)/gtk \ -I$(top_builddir)/gtk \

2
perf/Makefile.am
View file

@ -1,7 +1,7 @@
## Makefile.am for gtk+/perf ## Makefile.am for gtk+/perf
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \

6
tests/Makefile.am
View file

@ -1,7 +1,7 @@
## Makefile.am for gtk+/tests ## Makefile.am for gtk+/tests
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
@ -95,7 +95,9 @@ noinst_PROGRAMS += autotestkeywords
TESTS = autotestkeywords TESTS = autotestkeywords
autotestkeywords_SOURCES = autotestkeywords.cc autotestkeywords_SOURCES = autotestkeywords.cc
autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers autotestkeywords_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(srcdir)/dummy-headers
if HAVE_OBJC if HAVE_OBJC
autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++ autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++