xserver: Branch 'master' - 3 commits

Julien Cristau jcristau at kemper.freedesktop.org
Sun Jul 20 07:59:30 PDT 2008 

 glx/Makefile.am                           |    3 +++
 hw/xfree86/common/Makefile.am             |    7 +++----
 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 ++++----
 include/Makefile.am                       |    7 +++----
 11 files changed, 17 insertions(+), 19 deletions(-)

New commits:
commit 376620460ec50cb98a1e3746629b7f73c2e926d7
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Jul 20 16:53:01 2008 +0200

    Drop some more configure-generated files from the tarball

diff --git a/include/Makefile.am b/include/Makefile.am
index 3d78799..76c265e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -53,11 +53,10 @@ sdk_HEADERS =		\
 	windowstr.h	\
 	xkbfile.h	\
 	xkbsrv.h	\
-	xkbstr.h	\
-	xorg-server.h
+	xkbstr.h
+
+nodist_sdk_HEADERS = xorg-server.h
 endif
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
-EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h \
-	xkb-config.h
commit 35346a42271dfe65fe0a86dc522701028bf6daf6
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Jul 20 16:40:59 2008 +0200

    Don't put xf86Build.h in the tarball (bug#9277)
    
    This file is generated by configure, we don't need to ship a stale
    version in the tarball.
    X.Org bug#9277 <https://bugs.freedesktop.org/show_bug.cgi?id=9277>

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index d67d595..6aa1174 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -32,10 +32,11 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
                       xf86Option.c \
                       xf86VidMode.c xf86fbman.c xf86cmap.c \
                       xf86Helper.c xf86PM.c xf86RAC.c xf86Xinput.c xisb.c \
-                      xf86Mode.c xf86Build.h xorgHelper.c \
+                      xf86Mode.c xorgHelper.c \
                       $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
 nodist_libcommon_la_SOURCES = xf86DefModeSet.c
-libinit_a_SOURCES = xf86Build.h xf86Init.c
+libinit_a_SOURCES = xf86Init.c
+nodist_libinit_a_SOURCES = xf86Build.h
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 	   -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
@@ -57,7 +58,6 @@ EXTRA_DIST = \
 	fourcc.h \
 	scoasm.h \
 	xf86.h \
-	xf86Build.h \
 	xf86Bus.h \
 	xf86Config.h \
 	xf86InPriv.h \
@@ -76,7 +76,6 @@ EXTRA_DIST = \
 	xf86xvmc.h \
 	xf86xvpriv.h \
 	xisb.h \
-	xf86Build.h.in \
 	xf86Version.h \
 	xorgVersion.h \
 	xf86Date.h \
commit 43c6d5a6f83dfdf8596c8d0faf8ac1a64f73a8c1
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Jul 20 16:30:24 2008 +0200

    distcheck fixes
    
    Still seems to fail because hw/xquartz has too long filenames

diff --git a/glx/Makefile.am b/glx/Makefile.am
index f62d2ed..4f723ac 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 6ca350c..eb8b1cb 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 7128244..b521efe 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 6789030..fa23324 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 2214b1c..b405b1f 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 9cb5011..b5d40f7 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 68f6b4c..ca3dd31 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -19,7 +19,7 @@ solaris- at SOLARIS_INOUT_ARCH@.il: solaris- at 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 f9d2f23..e86e70a 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 c61a613..00d4255 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) \

More information about the xorg-commit mailing list