diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
| commit | 2c6d47108880584f1221ff86c6c8947627f9f607 (patch) | |
| tree | 64a042f58df056433c430fb0c99735d9e8c0904d /hw/xfree86/Makefile.am | |
| parent | c4fe1bcce1c1e4822e688959b331b47a051d6e0a (diff) | |
| parent | 85220446359a75ea2c359b418b4051c04eea739c (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
Diffstat (limited to 'hw/xfree86/Makefile.am')
| -rw-r--r-- | hw/xfree86/Makefile.am | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index f0c9e56f3..ec6a7acb5 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -8,16 +8,24 @@ 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 dixmods exa \ + ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \ + loader dixmods exa modes \ $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ - xf8_16bpp xf8_32bpp loader dixmods dri exa \ + xf8_16bpp xf8_32bpp loader dixmods dri exa modes \ utils doc bin_PROGRAMS = Xorg @@ -47,6 +55,10 @@ XORG_LIBS = \ rac/librac.a \ parser/libxf86config.a \ dixmods/libdixmods.la \ + modes/libxf86modes.a \ + ramdac/libramdac.a \ + ddc/libddc.a \ + i2c/libi2c.a \ @XORG_LIBS@ Xorg_DEPENDENCIES = \ |