diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-03-21 22:54:38 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2006-03-21 22:54:38 +0000 |
| commit | 966d93ef6d1f2ed02f3b81b5bf5a1ebbdd48c93d (patch) | |
| tree | 0026887efa40f5d39b889a7af852638adb75ff53 | |
| parent | 8e3ad87d01c102591c7dc25614f6ac10e444a1b1 (diff) | |
Make the server distcheck and tag 1.0.99.1 snapshot.xorg-server-1_0_99_1
Bump CVS version to 1.0.99.1.
Distcheck fixes.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | GL/mesa/Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Xext/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | os/Makefile.am | 1 |
6 files changed, 17 insertions, 3 deletions
@@ -1,5 +1,16 @@ 2006-03-21 Kristian Høgsberg <krh@redhat.com> + Make the server distcheck and tag 1.0.99.1 snapshot. + + * configure.ac: Bump CVS version to 1.0.99.1. + + * Makefile.am: + * os/Makefile.am: + * Xext/Makefile.am: + * GL/mesa/glapi/Makefile.am: Distcheck fixes. + +2006-03-21 Kristian Høgsberg <krh@redhat.com> + * GL/glx/glxcmds.c: * GL/glx/glxcmdsswap.c: #include indirect_dispatch to get prototypes for FBO functions. diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am index 72b699476..18eebfc92 100644 --- a/GL/mesa/Makefile.am +++ b/GL/mesa/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = main math array_cache swrast swrast_setup tnl shader X +SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi noinst_LTLIBRARIES = libGLcore.la diff --git a/Makefile.am b/Makefile.am index d8ca377fb..847615a0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc +DISTCHECK_CONFIGURE_FLAGS=--disable-xorgcfg if COMPOSITE COMPOSITE_DIR=composite @@ -107,6 +108,7 @@ DIST_SUBDIRS = \ XTrap \ composite \ GL \ + exa \ hw \ Xprint \ XpConfig \ diff --git a/Xext/Makefile.am b/Xext/Makefile.am index ddb1923a9..8ab4c8640 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -39,7 +39,7 @@ MODULE_SRCS = \ # Optional sources included if extension enabled by configure.ac rules # MIT Shared Memory extension -MITSHM_SRCS = shm.c +MITSHM_SRCS = shm.c shmint.h if MITSHM BUILTIN_SRCS += $(MITSHM_SRCS) endif diff --git a/configure.ac b/configure.ac index ef7ee2421..a35ac1608 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) dnl This is the not the Xorg version number, it's the server version number. dnl Yes, that's weird. -AC_INIT([xorg-server], 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE diff --git a/os/Makefile.am b/os/Makefile.am index c28435253..c4ebf21a5 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -21,6 +21,7 @@ libos_la_SOURCES = \ io.c \ mitauth.c \ oscolor.c \ + oscolor.h \ osdep.h \ osinit.c \ utils.c \ |