Commit 32e00d1f authored by Javier Jardon's avatar Javier Jardon

Use AM_CPPFLAGS instead the obsolete INCLUDES

parent 30930e64
...@@ -46,7 +46,7 @@ demos = \ ...@@ -46,7 +46,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 \
......
## Makefile.am for gtk+/demos ## Makefile.am for gtk+/demos
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 \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
......
...@@ -37,7 +37,7 @@ EXTRA_HFILES= \ ...@@ -37,7 +37,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 \
......
...@@ -94,7 +94,7 @@ IGNORE_HFILES= \ ...@@ -94,7 +94,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 \
......
...@@ -17,7 +17,7 @@ CFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.c ...@@ -17,7 +17,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)
......
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 \
......
...@@ -35,7 +35,7 @@ OLD_EXAMPLES = \ ...@@ -35,7 +35,7 @@ OLD_EXAMPLES = \
tictactoe \ tictactoe \
wheelbarrow wheelbarrow
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 \
......
...@@ -32,7 +32,7 @@ EXTRA_DIST += \ ...@@ -32,7 +32,7 @@ EXTRA_DIST += \
gdkenumtypes.h.template \ gdkenumtypes.h.template \
abicheck.sh abicheck.sh
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
...@@ -195,7 +195,7 @@ Gdk_3_0_gir_SCANNERFLAGS = \ ...@@ -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_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_LIBS = libgdk-3.la
Gdk_3_0_gir_FILES = $(introspection_files) 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 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
INTROSPECTION_GIRS += Gdk-3.0.gir INTROSPECTION_GIRS += Gdk-3.0.gir
...@@ -248,7 +248,7 @@ GdkX11_3_0_gir_SCANNERFLAGS = \ ...@@ -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_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_LIBS = libgdk-3.la
GdkX11_3_0_gir_FILES = $(x11_introspection_files) 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 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
INTROSPECTION_GIRS += GdkX11-3.0.gir INTROSPECTION_GIRS += GdkX11-3.0.gir
......
...@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl ...@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-3.0/gdk libgdkincludedir = $(includedir)/gtk-3.0/gdk
libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
......
...@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl ...@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-3.0/gdk libgdkincludedir = $(includedir)/gtk-3.0/gdk
libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
......
...@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl ...@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-3.0/gdk libgdkincludedir = $(includedir)/gtk-3.0/gdk
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
......
...@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl ...@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-3.0/gdk libgdkincludedir = $(includedir)/gtk-3.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) \
......
...@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl ...@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
libgdkincludedir = $(includedir)/gtk-3.0/gdk libgdkincludedir = $(includedir)/gtk-3.0/gdk
libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11 libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gdk\" \ -DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
......
...@@ -32,7 +32,7 @@ endif ...@@ -32,7 +32,7 @@ endif
endif endif
endif endif
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gtk\" \ -DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_LIBDIR=\"$(libdir)\" \ -DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATADIR=\"$(datadir)\" \ -DGTK_DATADIR=\"$(datadir)\" \
...@@ -894,7 +894,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template ...@@ -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 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 && \ $(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' | \ $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
sort | uniq | \ sort | uniq | \
$(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \ $(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 ...@@ -1018,7 +1018,7 @@ endif
Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h" Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
Gtk_3_0_gir_INCLUDES = Atk-1.0 Gtk_3_0_gir_INCLUDES = Atk-1.0
Gtk_3_0_gir_CFLAGS = \ Gtk_3_0_gir_CFLAGS = \
$(INCLUDES) \ $(AM_CPPFLAGS) \
-UGDK_DISABLE_DEPRECATED \ -UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \ -UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
......
...@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl ...@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS = SUBDIRS =
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 \
......
...@@ -4,7 +4,7 @@ SUBDIRS=Theme ...@@ -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 \
......
...@@ -4,7 +4,7 @@ if PLATFORM_WIN32 ...@@ -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 \
......
...@@ -4,7 +4,7 @@ if PLATFORM_WIN32 ...@@ -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 \
......
...@@ -4,7 +4,7 @@ if PLATFORM_WIN32 ...@@ -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,7 +2,7 @@ if OS_WIN32 ...@@ -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 \
......
## 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 \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment