diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/uxa/Makefile.am | 10 | ||||
| -rw-r--r-- | src/uxa/uxa-accel.c (renamed from uxa/uxa-accel.c) | 0 | ||||
| -rw-r--r-- | src/uxa/uxa-glamor.h (renamed from uxa/uxa-glamor.h) | 0 | ||||
| -rw-r--r-- | src/uxa/uxa-glyphs.c (renamed from uxa/uxa-glyphs.c) | 0 | ||||
| -rw-r--r-- | src/uxa/uxa-priv.h (renamed from uxa/uxa-priv.h) | 0 | ||||
| -rw-r--r-- | src/uxa/uxa-render.c (renamed from uxa/uxa-render.c) | 0 | ||||
| -rw-r--r-- | src/uxa/uxa-unaccel.c (renamed from uxa/uxa-unaccel.c) | 0 | ||||
| -rw-r--r-- | src/uxa/uxa.c (renamed from uxa/uxa.c) | 0 | ||||
| -rw-r--r-- | src/uxa/uxa.h (renamed from uxa/uxa.h) | 0 | ||||
| -rw-r--r-- | uxa/Makefile.am | 23 |
12 files changed, 10 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index 75913a62..2b3b5d4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,13 +20,8 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -SUBDIRS = man xvmc +SUBDIRS = man xvmc src -if UXA -SUBDIRS += uxa -endif - -SUBDIRS += src MAINTAINERCLEANFILES = ChangeLog INSTALL if HAVE_X11 diff --git a/configure.ac b/configure.ac index 0eadbabf..eb34946d 100644 --- a/configure.ac +++ b/configure.ac @@ -507,7 +507,6 @@ AC_SUBST([moduledir]) AC_CONFIG_FILES([ Makefile man/Makefile - uxa/Makefile src/Makefile src/legacy/Makefile src/legacy/i810/Makefile diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am index 5f89cfc2..945d7d42 100644 --- a/src/uxa/Makefile.am +++ b/src/uxa/Makefile.am @@ -23,7 +23,7 @@ AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@ AM_CFLAGS += -I$(top_srcdir)/uxa -I$(top_srcdir)/src -I$(top_srcdir)/src/render_program noinst_LTLIBRARIES = libuxa.la -libuxa_la_LIBADD = @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@ $(top_builddir)/uxa/libuxa.la +libuxa_la_LIBADD = @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@ libuxa_la_SOURCES = \ brw_defines.h \ brw_structs.h \ @@ -51,6 +51,14 @@ libuxa_la_SOURCES = \ i965_video.c \ i965_render.c \ uxa_module.h \ + uxa.c \ + uxa.h \ + uxa-accel.c \ + uxa-glamor.h \ + uxa-glyphs.c \ + uxa-render.c \ + uxa-priv.h \ + uxa-unaccel.c $(NULL) if GLAMOR diff --git a/uxa/uxa-accel.c b/src/uxa/uxa-accel.c index 27215ddf..27215ddf 100644 --- a/uxa/uxa-accel.c +++ b/src/uxa/uxa-accel.c diff --git a/uxa/uxa-glamor.h b/src/uxa/uxa-glamor.h index 5ff19e05..5ff19e05 100644 --- a/uxa/uxa-glamor.h +++ b/src/uxa/uxa-glamor.h diff --git a/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c index b022c833..b022c833 100644 --- a/uxa/uxa-glyphs.c +++ b/src/uxa/uxa-glyphs.c diff --git a/uxa/uxa-priv.h b/src/uxa/uxa-priv.h index 3f639e73..3f639e73 100644 --- a/uxa/uxa-priv.h +++ b/src/uxa/uxa-priv.h diff --git a/uxa/uxa-render.c b/src/uxa/uxa-render.c index d783ea26..d783ea26 100644 --- a/uxa/uxa-render.c +++ b/src/uxa/uxa-render.c diff --git a/uxa/uxa-unaccel.c b/src/uxa/uxa-unaccel.c index f4310494..f4310494 100644 --- a/uxa/uxa-unaccel.c +++ b/src/uxa/uxa-unaccel.c diff --git a/uxa/uxa.c b/src/uxa/uxa.c index 2635b502..2635b502 100644 --- a/uxa/uxa.c +++ b/src/uxa/uxa.c diff --git a/uxa/uxa.h b/src/uxa/uxa.h index b8569f04..b8569f04 100644 --- a/uxa/uxa.h +++ b/src/uxa/uxa.h diff --git a/uxa/Makefile.am b/uxa/Makefile.am deleted file mode 100644 index 2d10f229..00000000 --- a/uxa/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -noinst_LTLIBRARIES = libuxa.la - -# Override these since UXA doesn't need them and the needed files aren't -# built (in hw/xfree86/os-support/solaris) until after UXA is built -SOLARIS_ASM_CFLAGS="" - -AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) -I$(top_srcdir)/src/uxa - -if GLAMOR -AM_CFLAGS += @LIBGLAMOR_CFLAGS@ -libuxa_la_LIBADD = @LIBGLAMOR_LIBS@ -endif - -libuxa_la_SOURCES = \ - uxa.c \ - uxa.h \ - uxa-accel.c \ - uxa-glamor.h \ - uxa-glyphs.c \ - uxa-render.c \ - uxa-priv.h \ - uxa-unaccel.c - |