diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-02-27 14:14:47 -0500 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-02-27 14:14:47 -0500 |
commit | c16343ac2ca18391b21022b2edd02ad9f413d2b3 (patch) | |
tree | 26645ad9a0e5b93ac0f804338ddf58a30cc03a87 /hw | |
parent | 5680efc0d2baf0a9451e82e490e3690fc23dda0f (diff) |
Make mfb, cfb, and afb support configurable at build-time.
Diffstat (limited to 'hw')
-rw-r--r-- | hw/xfree86/Makefile.am | 12 | ||||
-rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 19 |
2 files changed, 25 insertions, 6 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 1a286d605..b66906380 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -8,11 +8,19 @@ if XF86UTILS XF86UTILS_SUBDIR = utils endif +if MFB +MFB_SUBDIR = xf1bpp xf4bpp +endif + +if CFB +CFB_SUBDIR = xf8_16bpp xf8_32bpp +endif + DOC_SUBDIR = doc SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \ - ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \ - xf8_32bpp loader scanpci dixmods exa modes \ + ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \ + loader scanpci dixmods exa modes \ $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index c34ddd6e3..58099bce9 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -14,12 +14,23 @@ if DBE DBEMOD = libdbe.la endif -module_LTLIBRARIES = libafb.la \ - libcfb.la \ - libcfb32.la \ +if AFB +AFBMOD = libafb.la +endif + +if CFB +CFBMOD = libcfb.la libcfb32.la +endif + +if MFB +MFBMOD = libmfb.la +endif + +module_LTLIBRARIES = $(AFBMOD) \ + $(CFBMOD) \ libfb.la \ libwfb.la \ - libmfb.la \ + $(MFBMOD) \ libshadow.la extsmoduledir = $(moduledir)/extensions |