From 43c6d5a6f83dfdf8596c8d0faf8ac1a64f73a8c1 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 20 Jul 2008 16:30:24 +0200 Subject: [PATCH] distcheck fixes Still seems to fail because hw/xquartz has too long filenames --- glx/Makefile.am | 3 +++ hw/xfree86/doc/devel/Makefile.am | 1 - hw/xfree86/os-support/Makefile.am | 2 +- hw/xfree86/os-support/bsd/Makefile.am | 1 - hw/xfree86/os-support/hurd/Makefile.am | 2 +- hw/xfree86/os-support/sco/Makefile.am | 1 - hw/xfree86/os-support/solaris/Makefile.am | 2 +- hw/xfree86/os-support/sysv/Makefile.am | 2 +- hw/xwin/Makefile.am | 8 ++++---- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/glx/Makefile.am b/glx/Makefile.am index f62d2ed86..4f723ac87 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -40,6 +40,8 @@ glapi_sources = \ glapitemp.h \ glapi.c \ glapi.h \ + glapioffsets.h \ + glprocs.h \ glthread.c \ glthread.h @@ -67,6 +69,7 @@ libglx_la_SOURCES = \ glxext.h \ glxdriswrast.c \ glxdricommon.c \ + glxdricommon.h \ glxscreens.c \ glxscreens.h \ glxserver.h \ diff --git a/hw/xfree86/doc/devel/Makefile.am b/hw/xfree86/doc/devel/Makefile.am index 6ca350c38..eb8b1cb29 100644 --- a/hw/xfree86/doc/devel/Makefile.am +++ b/hw/xfree86/doc/devel/Makefile.am @@ -2,7 +2,6 @@ # not installed on the system for end-users EXTRA_DIST = \ - DebuggingHints \ Domain.note \ RAC.Notes \ Registry \ diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am index 7128244de..b521efe82 100644 --- a/hw/xfree86/os-support/Makefile.am +++ b/hw/xfree86/os-support/Makefile.am @@ -3,7 +3,7 @@ DIST_SUBDIRS = bsd bus misc linux solaris sysv sco hurd sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h assyntax.h -EXTRA_DIST = int10Defines.h xf86OSpriv.h README.OS-lib +EXTRA_DIST = int10Defines.h xf86OSpriv.h # to get the grouping semantics right, you have to glom these three together # as one library, otherwise libtool will actively defeat your attempts to diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am index 678903056..fa233242c 100644 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ b/hw/xfree86/os-support/bsd/Makefile.am @@ -59,7 +59,6 @@ libbsd_la_SOURCES = \ $(srcdir)/../shared/vidmem.c \ bsd_VTsw.c \ bsd_init.c \ - bsd_mouse.c \ bsd_bell.c \ $(ARCH_SOURCES) \ $(AGP_SOURCES) \ diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am index 2214b1c2d..b405b1f2a 100644 --- a/hw/xfree86/os-support/hurd/Makefile.am +++ b/hw/xfree86/os-support/hurd/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libhurd.la libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \ - hurd_mouse.c hurd_video.c \ + hurd_video.c \ $(srcdir)/../shared/VTsw_noop.c \ $(srcdir)/../shared/posix_tty.c \ $(srcdir)/../shared/stdResource.c \ diff --git a/hw/xfree86/os-support/sco/Makefile.am b/hw/xfree86/os-support/sco/Makefile.am index 9cb5011fb..b5d40f7a5 100644 --- a/hw/xfree86/os-support/sco/Makefile.am +++ b/hw/xfree86/os-support/sco/Makefile.am @@ -2,5 +2,4 @@ EXTRA_DIST = \ VTsw_sco.c \ sco_init.c \ sco_iop.c \ - sco_mouse.c \ sco_video.c diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am index 68f6b4cd0..ca3dd31d0 100644 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ b/hw/xfree86/os-support/solaris/Makefile.am @@ -19,7 +19,7 @@ solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S noinst_LTLIBRARIES = libsolaris.la libsolaris_la_SOURCES = sun_bios.c sun_init.c \ - sun_mouse.c sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \ + sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \ $(srcdir)/../shared/kmod_noop.c \ $(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \ $(srcdir)/../shared/stdResource.c \ diff --git a/hw/xfree86/os-support/sysv/Makefile.am b/hw/xfree86/os-support/sysv/Makefile.am index f9d2f237a..e86e70ad1 100644 --- a/hw/xfree86/os-support/sysv/Makefile.am +++ b/hw/xfree86/os-support/sysv/Makefile.am @@ -1 +1 @@ -EXTRA_DIST = sysv_init.c sysv_mouse.c sysv_video.c +EXTRA_DIST = sysv_init.c sysv_video.c diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index c61a6135f..00d425544 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -167,10 +167,10 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \ dist_man1_MANS = XWin.man XWinrc.man GLX_EXTRAS = \ - windows/ChangeLog \ - windows/glwindows.h \ - windows/glwrap.c \ - windows/indirect.c + glx/ChangeLog \ + glx/glwindows.h \ + glx/glwrap.c \ + glx/indirect.c EXTRA_DIST = \ $(GLX_EXTRAS) \