diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | hw/xfree86/common/Makefile.am | 8 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Makefile.am | 8 |
3 files changed, 20 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2005-08-04 Adam Jackson <ajax@freedesktop.org> + * hw/xfree86/common/Makefile.am: + * hw/xfree86/os-support/bus/Makefile.am: + EXTRA_DIST hacks to get all the OS support files into the tarball. + +2005-08-04 Adam Jackson <ajax@freedesktop.org> + * configure.ac: * GL/Makefile.am: * GL/include/Makefile.am: diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 0d5331ebe..5cb164a21 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -67,6 +67,11 @@ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \ DISTCLEANFILES = xf86Build.h +# this is a hack for now. as above we don't have rules to build all of these +# yet, but we want to make sure they all get into the distball. this should +# eventually go away. +DISTKBDSOURCES = xf86Kbd.c xf86KbdBSD.c xf86KbdLnx.c xf86KbdMach.c + EXTRA_DIST = \ atKeynames.h \ compiler.h \ @@ -96,6 +101,7 @@ EXTRA_DIST = \ xf86Build.h.in \ xf86Version.h \ xorgVersion.h \ - xf86Date.h + xf86Date.h \ + $(DISTKBDSOURCES) AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 786e99c94..868046664 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -21,10 +21,16 @@ INCLUDES = $(XORG_INCS) AM_CFLAGS = $(XORG_CFLAGS) +# hack to keep all the OS PCI support files in the distball even though +# there aren't rules to build them all yet. also the AC_SUBST pattern +# above will defeat automake's EXTRA_DIST logic, woo. +PCIDISTSOURCES = freebsdPci.c linuxPci.c netbsdPci.c + EXTRA_DIST = \ 460gxPCI.h \ Pci.h \ altixPCI.h \ e8870PCI.h \ - zx1PCI.h + zx1PCI.h \ + $(PCIDISTSOURCES) |