[PATCH] Convert INCLUDES to AM_CPPFLAGS
Gaetan Nadon
memsize at videotron.ca
Fri Jan 18 06:24:37 PST 2013
On 13-01-18 06:40 AM, Thierry Reding wrote:
> INCLUDES has been deprecated starting with automake 1.13. Convert all
> occurrences with the recommended AM_CPPFLAGS replacement.
>
> Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
> ---
> exa/Makefile.am | 2 +-
> glx/Makefile.am | 4 ++--
> hw/kdrive/ephyr/Makefile.am | 2 +-
> hw/kdrive/fake/Makefile.am | 2 +-
> hw/kdrive/fbdev/Makefile.am | 2 +-
> hw/kdrive/linux/Makefile.am | 2 +-
> hw/kdrive/src/Makefile.am | 2 +-
> hw/xfree86/Makefile.am | 2 +-
> hw/xfree86/common/Makefile.am | 10 +++++-----
> hw/xfree86/ddc/Makefile.am | 2 +-
> hw/xfree86/dixmods/Makefile.am | 8 ++++----
> hw/xfree86/exa/Makefile.am | 2 +-
> hw/xfree86/fbdevhw/Makefile.am | 2 +-
> hw/xfree86/i2c/Makefile.am | 2 +-
> hw/xfree86/int10/Makefile.am | 6 +++---
> hw/xfree86/loader/Makefile.am | 6 +++---
> hw/xfree86/modes/Makefile.am | 10 +++++-----
> hw/xfree86/os-support/bsd/Makefile.am | 2 +-
> hw/xfree86/os-support/bus/Makefile.am | 2 +-
> hw/xfree86/os-support/hurd/Makefile.am | 2 +-
> hw/xfree86/os-support/linux/Makefile.am | 2 +-
> hw/xfree86/os-support/misc/Makefile.am | 2 +-
> hw/xfree86/os-support/solaris/Makefile.am | 2 +-
> hw/xfree86/os-support/stub/Makefile.am | 2 +-
> hw/xfree86/parser/Makefile.am | 2 +-
> hw/xfree86/ramdac/Makefile.am | 2 +-
> hw/xfree86/shadowfb/Makefile.am | 2 +-
> hw/xfree86/utils/cvt/Makefile.am | 6 +++---
> hw/xfree86/vbe/Makefile.am | 4 ++--
> hw/xfree86/vgahw/Makefile.am | 2 +-
> hw/xfree86/x86emu/Makefile.am | 2 --
> hw/xwin/Makefile.am | 2 +-
> hw/xwin/glx/Makefile.am | 2 +-
> miext/damage/Makefile.am | 2 +-
> miext/sync/Makefile.am | 2 --
> test/Makefile.am | 4 ++--
> test/xi2/Makefile.am | 2 +-
> 37 files changed, 55 insertions(+), 59 deletions(-)
>
> diff --git a/exa/Makefile.am b/exa/Makefile.am
> index 8b759cd..c1f1e86 100644
> --- a/exa/Makefile.am
> +++ b/exa/Makefile.am
> @@ -8,7 +8,7 @@ if XORG
> sdk_HEADERS = exa.h
> endif
>
> -INCLUDES = \
> +AM_CPPFLAGS = \
> $(XORG_INCS) \
> -I$(srcdir)/../miext/cw
>
> diff --git a/glx/Makefile.am b/glx/Makefile.am
> index 591c4ac..d1c203d 100644
> --- a/glx/Makefile.am
> +++ b/glx/Makefile.am
> @@ -15,7 +15,7 @@ AM_CFLAGS = \
> # none yet
> #sdk_HEADERS =
>
> -INCLUDES = \
> +AM_CPPFLAGS = \
> -I$(top_srcdir)/hw/xfree86/os-support \
> -I$(top_srcdir)/hw/xfree86/os-support/bus \
> -I$(top_srcdir)/hw/xfree86/common \
> @@ -23,7 +23,7 @@ INCLUDES = \
> -I$(top_srcdir)/mi
>
> if DRI2_AIGLX
> -INCLUDES += -I$(top_srcdir)/hw/xfree86/dri2
> +AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/dri2
> endif
>
> glapi_sources = \
> diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
> index 2e0613a..ab02437 100644
> --- a/hw/kdrive/ephyr/Makefile.am
> +++ b/hw/kdrive/ephyr/Makefile.am
> @@ -1,6 +1,6 @@
> SUBDIRS = man
>
> -INCLUDES = \
> +AM_CPPFLAGS = \
> @KDRIVE_INCS@ \
> @KDRIVE_CFLAGS@ \
> @XEPHYR_INCS@ \
> diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
> index 6d3ed05..14c99c3 100644
> --- a/hw/kdrive/fake/Makefile.am
> +++ b/hw/kdrive/fake/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES = \
> +AM_CPPFLAGS = \
> @KDRIVE_INCS@ \
> @KDRIVE_CFLAGS@
>
> diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
> index ec9df95..7e8ba02 100644
> --- a/hw/kdrive/fbdev/Makefile.am
> +++ b/hw/kdrive/fbdev/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES = \
> +AM_CPPFLAGS = \
> @KDRIVE_INCS@ \
> @KDRIVE_CFLAGS@
>
> diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
> index 93e5d2f..1362cd9 100644
> --- a/hw/kdrive/linux/Makefile.am
> +++ b/hw/kdrive/linux/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES = \
> +AM_CPPFLAGS = \
> @KDRIVE_INCS@ \
> @KDRIVE_CFLAGS@
>
> diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
> index 51375b9..5799ddb 100644
> --- a/hw/kdrive/src/Makefile.am
> +++ b/hw/kdrive/src/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES = \
> +AM_CPPFLAGS = \
> @KDRIVE_INCS@ \
> @KDRIVE_CFLAGS@
>
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index c3899b5..dfce9f6 100644
> --- a/hw/xfree86/Makefile.am
> +++ b/hw/xfree86/Makefile.am
> @@ -39,7 +39,7 @@ bin_PROGRAMS = Xorg
> nodist_Xorg_SOURCES = sdksyms.c
>
> AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
> -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
> -I$(srcdir)/dri -I$(srcdir)/dri2
>
> diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
> index 532d87b..2207366 100644
> --- a/hw/xfree86/common/Makefile.am
> +++ b/hw/xfree86/common/Makefile.am
> @@ -53,11 +53,11 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
> nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
> libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
>
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
> - -I$(srcdir)/../loader -I$(srcdir)/../parser \
> - -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
> - -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \
> - -I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
> + -I$(srcdir)/../loader -I$(srcdir)/../parser \
> + -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
> + -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \
> + -I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2
>
> sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
> xf86PciInfo.h xf86Priv.h xf86Privstr.h \
> diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am
> index 93ea4a2..a7b84ad 100644
> --- a/hw/xfree86/ddc/Makefile.am
> +++ b/hw/xfree86/ddc/Makefile.am
> @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libddc.la
>
> libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c
>
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../i2c
>
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
>
> diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
> index f161db6..be2748d 100644
> --- a/hw/xfree86/dixmods/Makefile.am
> +++ b/hw/xfree86/dixmods/Makefile.am
> @@ -12,10 +12,10 @@ extsmoduledir = $(moduledir)/extensions
> extsmodule_LTLIBRARIES = $(GLXMODS)
>
> AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
> -INCLUDES = @XORG_INCS@ \
> - -I$(top_srcdir)/hw/xfree86/loader \
> - -I$(top_srcdir)/miext/shadow \
> - -I$(top_srcdir)/glx
> +AM_CPPFLAGS = @XORG_INCS@ \
> + -I$(top_srcdir)/hw/xfree86/loader \
> + -I$(top_srcdir)/miext/shadow \
> + -I$(top_srcdir)/glx
>
> libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
> libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
> diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
> index 4339084..1e42cda 100644
> --- a/hw/xfree86/exa/Makefile.am
> +++ b/hw/xfree86/exa/Makefile.am
> @@ -4,7 +4,7 @@ module_LTLIBRARIES = libexa.la
>
> libexa_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
>
> -INCLUDES = \
> +AM_CPPFLAGS = \
> $(XORG_INCS) \
> -I$(srcdir)/../../../exa \
> -I$(srcdir)/../../../miext/cw
> diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am
> index 1fa9321..ec0b0bb 100644
> --- a/hw/xfree86/fbdevhw/Makefile.am
> +++ b/hw/xfree86/fbdevhw/Makefile.am
> @@ -10,7 +10,7 @@ else
> libfbdevhw_la_SOURCES = fbdevhwstub.c
> endif
>
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../i2c
>
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
>
> diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
> index cb18db1..c311591 100644
> --- a/hw/xfree86/i2c/Makefile.am
> +++ b/hw/xfree86/i2c/Makefile.am
> @@ -12,7 +12,7 @@ multimedia_LTLIBRARIES = \
>
> libi2c_la_SOURCES = xf86i2c.c
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
>
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
>
> diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
> index f5ece69..383846c 100644
> --- a/hw/xfree86/int10/Makefile.am
> +++ b/hw/xfree86/int10/Makefile.am
> @@ -19,7 +19,7 @@ endif
>
> if INT10_VM86
> AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
> libint10_la_SOURCES = \
> $(COMMON_SOURCES) \
> $(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \
> @@ -29,7 +29,7 @@ endif
> if INT10_X86EMU
> AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
> $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS)
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../x86emu
> libint10_la_SOURCES = \
> $(COMMON_SOURCES) \
> xf86x86emu.c \
> @@ -39,7 +39,7 @@ endif
>
> if INT10_STUB
> AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
> libint10_la_SOURCES = stub.c xf86int10module.c
> endif
>
> diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
> index bd47a63..983519a 100644
> --- a/hw/xfree86/loader/Makefile.am
> +++ b/hw/xfree86/loader/Makefile.am
> @@ -1,8 +1,8 @@
> noinst_LTLIBRARIES = libloader.la
>
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \
> - -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \
> - -I$(srcdir)/../ramdac -I$(srcdir)/../dri -I$(srcdir)/../dri2
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \
> + -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \
> + -I$(srcdir)/../ramdac -I$(srcdir)/../dri -I$(srcdir)/../dri2
>
> #AM_LDFLAGS = -r
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
> diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
> index 9236426..f835c5e 100644
> --- a/hw/xfree86/modes/Makefile.am
> +++ b/hw/xfree86/modes/Makefile.am
> @@ -20,11 +20,11 @@ libxf86modes_la_SOURCES = \
> xf86Rotate.c \
> $(DGA_SRCS)
>
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
> - -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
> - -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
> - -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \
> - -I$(srcdir)/../dixmods/extmod
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
> + -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
> + -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
> + -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \
> + -I$(srcdir)/../dixmods/extmod
>
> sdk_HEADERS = \
> xf86Crtc.h \
> diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
> index b6ecdf1..7133c0f 100644
> --- a/hw/xfree86/os-support/bsd/Makefile.am
> +++ b/hw/xfree86/os-support/bsd/Makefile.am
> @@ -54,7 +54,7 @@ endif
> # FIXME: NetBSD Aperture defines (configure.ac)
> AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS)
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
>
> libbsd_la_SOURCES = \
> $(srcdir)/../shared/posix_tty.c \
> diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
> index e09d4d2..eebb3ae 100644
> --- a/hw/xfree86/os-support/bus/Makefile.am
> +++ b/hw/xfree86/os-support/bus/Makefile.am
> @@ -17,7 +17,7 @@ endif
>
> libbus_la_SOURCES = $(PCI_SOURCES) $(PLATFORM_SOURCES) nobus.c
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
>
> AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
>
> diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am
> index 3e82247..f228c1c 100644
> --- a/hw/xfree86/os-support/hurd/Makefile.am
> +++ b/hw/xfree86/os-support/hurd/Makefile.am
> @@ -12,4 +12,4 @@ libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
>
> AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
> diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
> index 61175b3..83e7e00 100644
> --- a/hw/xfree86/os-support/linux/Makefile.am
> +++ b/hw/xfree86/os-support/linux/Makefile.am
> @@ -34,7 +34,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c \
>
> AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
>
> -INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
> +AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
>
> EXTRA_DIST = \
> $(srcdir)/../shared/xf86Axp.h
> diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am
> index 4bd3fc3..0265aec 100644
> --- a/hw/xfree86/os-support/misc/Makefile.am
> +++ b/hw/xfree86/os-support/misc/Makefile.am
> @@ -5,7 +5,7 @@ libmisc_la_SOURCES = SlowBcopy.c
>
> #AM_LDFLAGS = -r
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
>
> AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
>
> diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
> index 5163f44..1179f3f 100644
> --- a/hw/xfree86/os-support/solaris/Makefile.am
> +++ b/hw/xfree86/os-support/solaris/Makefile.am
> @@ -31,7 +31,7 @@ nodist_sdk_HEADERS = solaris- at SOLARIS_INOUT_ARCH@.il
>
> AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
>
> EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S \
> apSolaris.shar sun_inout.s
> diff --git a/hw/xfree86/os-support/stub/Makefile.am b/hw/xfree86/os-support/stub/Makefile.am
> index a1156ef..a39e17d 100644
> --- a/hw/xfree86/os-support/stub/Makefile.am
> +++ b/hw/xfree86/os-support/stub/Makefile.am
> @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libstub.la
>
> AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
>
> libstub_la_SOURCES = \
> $(srcdir)/../shared/VTsw_noop.c \
> diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
> index 002cfbf..3bf62e8 100644
> --- a/hw/xfree86/parser/Makefile.am
> +++ b/hw/xfree86/parser/Makefile.am
> @@ -51,4 +51,4 @@ sdk_HEADERS = \
> xf86Parser.h \
> xf86Optrec.h
>
> -INCLUDES = -I$(srcdir)/../common
> +AM_CPPFLAGS = -I$(srcdir)/../common
> diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am
> index 346af4c..a3d7762 100644
> --- a/hw/xfree86/ramdac/Makefile.am
> +++ b/hw/xfree86/ramdac/Makefile.am
> @@ -9,4 +9,4 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
> CURSOR.NOTES
>
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
> diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am
> index 5756fca..22f7ada 100644
> --- a/hw/xfree86/shadowfb/Makefile.am
> +++ b/hw/xfree86/shadowfb/Makefile.am
> @@ -5,6 +5,6 @@ libshadowfb_la_LIBADD = $(PIXMAN_LIBS)
>
> sdk_HEADERS = shadowfb.h
>
> -INCLUDES = $(XORG_INCS)
> +AM_CPPFLAGS = $(XORG_INCS)
>
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
> diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am
> index 4ebcedf..83c8f0d 100644
> --- a/hw/xfree86/utils/cvt/Makefile.am
> +++ b/hw/xfree86/utils/cvt/Makefile.am
> @@ -22,9 +22,9 @@
>
> bin_PROGRAMS = cvt
>
> -INCLUDES = $(XORG_INCS) \
> - -I$(top_srcdir)/hw/xfree86/ddc \
> - -I$(top_srcdir)/hw/xfree86/parser
> +AM_CPPFLAGS = $(XORG_INCS) \
> + -I$(top_srcdir)/hw/xfree86/ddc \
> + -I$(top_srcdir)/hw/xfree86/parser
>
> # gah
> cvt_SOURCES = cvt.c \
> diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
> index 0b24faf..0b1c1a3 100644
> --- a/hw/xfree86/vbe/Makefile.am
> +++ b/hw/xfree86/vbe/Makefile.am
> @@ -9,5 +9,5 @@ sdk_HEADERS = vbe.h vbeModes.h
>
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
>
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
> - -I$(srcdir)/../int10
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
> + -I$(srcdir)/../int10
> diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am
> index f48e46a..f0b6574 100644
> --- a/hw/xfree86/vgahw/Makefile.am
> +++ b/hw/xfree86/vgahw/Makefile.am
> @@ -1,7 +1,7 @@
> module_LTLIBRARIES = libvgahw.la
> libvgahw_la_LDFLAGS = -avoid-version
> libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
> -INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
> +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
>
> sdk_HEADERS = vgaHW.h
> diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
> index df96977..ee512f7 100644
> --- a/hw/xfree86/x86emu/Makefile.am
> +++ b/hw/xfree86/x86emu/Makefile.am
> @@ -11,8 +11,6 @@ libx86emu_la_SOURCES = debug.c \
> sys.c \
> x86emu.h
>
> -INCLUDES =
> -
> AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
>
> EXTRA_DIST = validate.c \
> diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
> index 93ce570..bc347ae 100644
> --- a/hw/xwin/Makefile.am
> +++ b/hw/xwin/Makefile.am
> @@ -149,7 +149,7 @@ SRCS = InitInput.c \
>
> XWin_SOURCES = $(SRCS)
>
> -INCLUDES = -I$(top_srcdir)/miext/rootless
> +AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
>
> XWIN_SYS_LIBS += -ldxguid
>
> diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
> index 59f6879..c0b42f9 100644
> --- a/hw/xwin/glx/Makefile.am
> +++ b/hw/xwin/glx/Makefile.am
> @@ -23,7 +23,7 @@ endif
>
> DEFS = $(DEFS_MULTIWINDOW) $(DEFS_MULTIWINDOWEXTWM) $(DEFS_GLX_WINDOWS)
>
> -INCLUDES = -I$(top_srcdir)/miext/rootless
> +AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
>
> AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
> $(XWINMODULES_CFLAGS) \
> diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am
> index 767a65a..a7f432a 100644
> --- a/miext/damage/Makefile.am
> +++ b/miext/damage/Makefile.am
> @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libdamage.la
>
> AM_CFLAGS = $(DIX_CFLAGS)
>
> -INCLUDES = -I$(srcdir)/../cw
> +AM_CPPFLAGS = -I$(srcdir)/../cw
>
> if XORG
> sdk_HEADERS = damage.h damagestr.h
> diff --git a/miext/sync/Makefile.am b/miext/sync/Makefile.am
> index 36b2816..32d0aa9 100644
> --- a/miext/sync/Makefile.am
> +++ b/miext/sync/Makefile.am
> @@ -2,8 +2,6 @@ noinst_LTLIBRARIES = libsync.la
>
> AM_CFLAGS = $(DIX_CFLAGS)
>
> -INCLUDES =
> -
> if XORG
> sdk_HEADERS = misync.h misyncstr.h
> endif
> diff --git a/test/Makefile.am b/test/Makefile.am
> index 34f53fc..eff0c9d 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -13,9 +13,9 @@ TESTS=$(noinst_PROGRAMS)
> TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
>
> AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
> -INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
> +AM_CPPFLAGS = $(XORG_INCS) -I$(top_srcdir)/miext/cw
> if XORG
> -INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
> +AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \
> -I$(top_srcdir)/hw/xfree86/ddc \
> -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
> -I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri \
> diff --git a/test/xi2/Makefile.am b/test/xi2/Makefile.am
> index 9de7abf..bfddfef 100644
> --- a/test/xi2/Makefile.am
> +++ b/test/xi2/Makefile.am
> @@ -17,7 +17,7 @@ TESTS=$(noinst_PROGRAMS)
> TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
>
> AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
> -INCLUDES = @XORG_INCS@
> +AM_CPPFLAGS = @XORG_INCS@
> TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
> COMMON_SOURCES=protocol-common.h protocol-common.c
>
Reviewed-by: Gaetan Nadon<memsize at videotron.ca>
More information about the xorg-devel
mailing list