diff options
| -rw-r--r-- | exa/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/exa/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xfree86/loader/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/exa/Makefile.am b/exa/Makefile.am index 6a09966f8..00b28b1e4 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 c45d8c9fb..64c4f7456 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 1e42cdacd..ccbb305d3 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 a658ca50f..9218cab83 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 4d935a268..d151b02d0 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 \ |