diff --git a/ChangeLog b/ChangeLog index 663bd6494..397a01473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-10-14 Kristian Høgsberg + + * hw/xfree86/os-support/Makefile.am (DIST_SUBDIRS): Add sysv and + sco os-support subdirs and add simple EXTRA_DIST Makefile.am in + those dirs. Remove unsupported os-support subdirs (bsdi, dgux, + hurd, nto, os2, pmax, qnx4) that have no maintainer and we don't + dist. + + * hw/xfree86/Makefile.am (EXTRA_DIST): Add Options. + 2005-10-13 Donnie Berkholz * configure.ac: Add XTRAP_LIB to XPRINT_EXTENSIONS to fix xprint build when diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index d350f72a3..fdeb4d201 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -69,4 +69,4 @@ if INSTALL_SETUID chmod u+s $(DESTDIR)$(bindir)/Xorg endif -EXTRA_DIST = xorgconf.cpp +EXTRA_DIST = xorgconf.cpp Options diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am index 6341e8daf..eeac02925 100644 --- a/hw/xfree86/os-support/Makefile.am +++ b/hw/xfree86/os-support/Makefile.am @@ -3,7 +3,7 @@ DRI_SUBDIRS=drm endif SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) -DIST_SUBDIRS = bsd bus drm misc linux solaris +DIST_SUBDIRS = bsd bus drm misc linux solaris sysv sco sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \ xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h diff --git a/hw/xfree86/os-support/sco/Makefile.am b/hw/xfree86/os-support/sco/Makefile.am new file mode 100644 index 000000000..c7f3175b8 --- /dev/null +++ b/hw/xfree86/os-support/sco/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = sco_init.c sco_io.c sco_iop.c sco_mouse.c sco_video.c VTsw_sco.c diff --git a/hw/xfree86/os-support/sysv/Makefile.am b/hw/xfree86/os-support/sysv/Makefile.am new file mode 100644 index 000000000..b67cf99d9 --- /dev/null +++ b/hw/xfree86/os-support/sysv/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = sysv_init.c sysv_io.c sysv_mouse.c sysv_video.c xqueue.c xqueue.h