[PATCH] xfree86: de-duplicate some AM_CPPFLAGS

[Alan Coopersmith]

On 08/ 5/13 08:16 PM, Peter Hutterer wrote:
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>   hw/xfree86/int10/Makefile.am | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
> index 383846c..66cb14d 100644
> --- a/hw/xfree86/int10/Makefile.am
> +++ b/hw/xfree86/int10/Makefile.am
> @@ -17,9 +17,10 @@ if I386_VIDEO
>   I386_VIDEO_CFLAGS = -D_PC
>   endif
>
> +AM_CPPFLAGS = $(XORG_INCS)
> +
>   if INT10_VM86
>   AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> -AM_CPPFLAGS = $(XORG_INCS)
>   libint10_la_SOURCES = \
>   	$(COMMON_SOURCES) \
>   	$(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \
> @@ -29,7 +30,7 @@ endif
>   if INT10_X86EMU
>   AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
>              $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS)
> -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../x86emu
> +AM_CPPFLAGS += -I$(srcdir)/../x86emu
>   libint10_la_SOURCES = \
>   	$(COMMON_SOURCES) \
>   	xf86x86emu.c \
> @@ -39,7 +40,6 @@ endif
>
>   if INT10_STUB
>   AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> -AM_CPPFLAGS = $(XORG_INCS)
>   libint10_la_SOURCES = stub.c xf86int10module.c
>   endif
>
>

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc