On 27 October 2015 at 17:28, Adam Jackson <[email protected]> wrote: > Signed-off-by: Adam Jackson <[email protected]> > --- > exa/Makefile.am | 4 +--- > hw/xfree86/Makefile.am | 2 +- > hw/xfree86/exa/Makefile.am | 3 +-- > hw/xfree86/loader/Makefile.am | 2 +- > test/Makefile.am | 2 +- > 5 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/exa/Makefile.am b/exa/Makefile.am > index 6a09966..00b28b1 100644 > --- a/exa/Makefile.am > +++ b/exa/Makefile.am > @@ -4,9 +4,7 @@ if XORG > sdk_HEADERS = exa.h > endif > > -AM_CPPFLAGS = \ > - $(XORG_INCS) \ > - -I$(srcdir)/../miext/cw > +AM_CPPFLAGS = $(XORG_INCS) > > AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) > > diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am > index c45d8c9..64c4f74 100644 > --- a/hw/xfree86/Makefile.am > +++ b/hw/xfree86/Makefile.am > @@ -49,7 +49,7 @@ bin_PROGRAMS = Xorg > nodist_Xorg_SOURCES = sdksyms.c > > AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ > -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \ > +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \ > -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \ > -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3 > > diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am > index 1e42cda..ccbb305 100644 > --- a/hw/xfree86/exa/Makefile.am > +++ b/hw/xfree86/exa/Makefile.am > @@ -6,8 +6,7 @@ libexa_la_LDFLAGS = -module -avoid-version > $(LD_NO_UNDEFINED_FLAG) > > AM_CPPFLAGS = \ > $(XORG_INCS) \ > - -I$(srcdir)/../../../exa \ > - -I$(srcdir)/../../../miext/cw > + -I$(srcdir)/../../../exa > > AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) > > diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am > index a658ca5..9218cab 100644 > --- a/hw/xfree86/loader/Makefile.am > +++ b/hw/xfree86/loader/Makefile.am > @@ -1,6 +1,6 @@ > noinst_LTLIBRARIES = libloader.la > > -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \ > +AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser \ > -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \ > -I$(srcdir)/../ramdac -I$(srcdir)/../dri -I$(srcdir)/../dri2 > > diff --git a/test/Makefile.am b/test/Makefile.am > index 4d935a2..d151b02 100644 > --- a/test/Makefile.am > +++ b/test/Makefile.am > @@ -16,7 +16,7 @@ TESTS=$(noinst_PROGRAMS) > TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) > > AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ > -AM_CPPFLAGS = $(XORG_INCS) -I$(top_srcdir)/miext/cw > +AM_CPPFLAGS = $(XORG_INCS) > if XORG > AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \ > -I$(top_srcdir)/hw/xfree86/ddc \
Nicely spotted. miext/cw hasn't been around for a few years :-) commit a44a379a2a4c198dbd6ffd6cc0db376f8fb64327 Author: Adam Jackson <[email protected]> Date: Thu Jul 19 15:00:03 2012 -0400 cw: Remove Fwiw the patch is: Reviewed-by: Emil Velikov <[email protected]> -Emil _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
