diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-09-14 07:49:22 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-09-14 07:49:22 +0000 |
| commit | 0888ad3874414e32535fecdb717ee7ab86f9d4cc (patch) | |
| tree | 772622fd1c14a28075ef03f625470d061e255580 | |
| parent | dfb5da93bc16b2fd2b00e939dbe101a04bdeab4f (diff) | |
Build xf8_32bpp, which is wanted by the mga driver, and export elf.h, which
is wanted by the rendition driver.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xfree86/loader/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xfree86/xf8_32bpp/Makefile.am | 2 |
5 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2005-09-14 Eric Anholt <anholt@FreeBSD.org> + + * configure.ac: + * hw/xfree86/Makefile.am: + * hw/xfree86/loader/Makefile.am: + * hw/xfree86/xf8_32bpp/Makefile.am: + Build xf8_32bpp, which is wanted by the mga driver, and export elf.h, + which is wanted by the rendition driver. + 2005-09-13 Eric Anholt <anholt@FreeBSD.org> * configure.ac: diff --git a/configure.ac b/configure.ac index bdce69f68..db56d08ce 100644 --- a/configure.ac +++ b/configure.ac @@ -1049,6 +1049,7 @@ hw/xfree86/xaa/Makefile hw/xfree86/xf1bpp/Makefile hw/xfree86/xf4bpp/Makefile hw/xfree86/xf8_16bpp/Makefile +hw/xfree86/xf8_32bpp/Makefile hw/xfree86/xf8_32wid/Makefile hw/dmx/config/Makefile hw/dmx/input/Makefile diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index e1177a7e1..ef0f4731e 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -4,11 +4,11 @@ endif SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \ ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \ - xf8_32wid loader scanpci dixmods exa $(DRI_SUBDIR) + xf8_32bpp xf8_32wid loader scanpci dixmods exa $(DRI_SUBDIR) DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ - xf8_16bpp xf8_32wid loader scanpci dixmods dri exa + xf8_16bpp xf8_32bpp xf8_32wid loader scanpci dixmods dri exa bin_PROGRAMS = Xorg diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index b3b2a635d..e3e8efc06 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -12,6 +12,9 @@ if XORG_LOADER_SPARC SPARC_SOURCES = SparcMulDiv.S endif +sdk_HEADERS = \ + elf.h + EXTRA_DIST = \ aout.h \ aoutloader.h \ diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am index a5dfcec2d..70a9ec13d 100644 --- a/hw/xfree86/xf8_32bpp/Makefile.am +++ b/hw/xfree86/xf8_32bpp/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libxf8_32bpp.la sdk_HEADERS = cfb8_32.h -INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb +INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb AM_CFLAGS = $(XORG_CFLAGS) libxf8_32bpp_la_SOURCES = \ |