diff --git a/ChangeLog b/ChangeLog index 367b26f30..85316fcb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-13 Matthias Hopf + + Needed for 'make distcheck': + * GL/mesa/Makefile.am: Add glapi to DIST_SUBDIRS. + * hw/xfree86/Makefile.am: Sync to trunk branch. + 2006-03-11 David Reveman * hw/xgl/glxext/xglglxext.c (xglBindTexImage): Add missing break diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am index 72b699476..bb758278c 100644 --- a/GL/mesa/Makefile.am +++ b/GL/mesa/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = main math array_cache swrast swrast_setup tnl shader X +DIST_SUBDIRS = $(SUBDIRS) glapi noinst_LTLIBRARIES = libGLcore.la diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 1597004c9..1bec7193e 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -6,12 +6,12 @@ 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 xf8_32wid loader scanpci dixmods exa \ + xf8_32bpp loader scanpci dixmods exa \ $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ - xf8_16bpp xf8_32bpp xf8_32wid loader scanpci dixmods dri exa \ + xf8_16bpp xf8_32bpp loader scanpci dixmods dri exa \ utils doc getconfig bin_PROGRAMS = Xorg