andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Bug #3960: Add remaining GLX and pci.ids stuff to DIST (Cha Young-Ho,

Browse Source 
Olli Helenius)
- Fix some distcheck problems for non-solaris systems
- Change server version number from the Xorg rev to an independent one
- _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values
This commit is contained in:
Adam Jackson 2005-08-04 22:31:20 +00:00
parent ed4d77a16a
commit 39a80312e0
7 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2005-08-04 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
* GL/Makefile.am:
* GL/include/Makefile.am:
* GL/include/GL/Makefile.am:
* hw/xfree86/os-support/solaris/Makefile.am:
* hw/xfree86/scanpci/Makefile.am:
- Bug #3960: Add remaining GLX and pci.ids stuff to DIST
(Cha Young-Ho, Olli Helenius)
- Fix some distcheck problems for non-solaris systems
- Change server version number from the Xorg rev to an independent one
- _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values
2005-08-04 Adam Jackson <ajax@freedesktop.org> 2005-08-04 Adam Jackson <ajax@freedesktop.org>
* configure.ac: * configure.ac:

2
GL/Makefile.am
View File

@ -1,4 +1,4 @@
SUBDIRS = glx mesa SUBDIRS = glx mesa include
# someone could get really crazy someday and add support for the SI... # someone could get really crazy someday and add support for the SI...

1
GL/include/GL/Makefile.am Normal file
View File

@ -0,0 +1 @@
EXTRA_DIST = glx_ansic.h xf86glx.h

1
GL/include/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = GL

14
configure.ac
View File

@ -24,9 +24,9 @@ dnl
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57) AC_PREREQ(2.57)
dnl we aren't intelligent about padding the version, so it always has to be four dnl This is the not the Xorg version number, it's the server version number.
dnl digits. ho hum. dnl Yes, that's weird.
AC_INIT([xorg-server], 6.99.99.900, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_INIT([xorg-server], 0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -151,7 +151,7 @@ AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME",
DEFAULT_VENDOR_STRING="X.Org" DEFAULT_VENDOR_STRING="X.Org"
DEFAULT_VENDOR_RELEASE="$PACKAGE_VERSION" DEFAULT_VENDOR_RELEASE="$PACKAGE_VERSION"
# e.g. 6.9.99.1 -> 6,9,99,1,0 # e.g. 6.9.99.1 -> 6,9,99,1,0
VERSION_STRING="${DEFAULT_VENDOR_RELEASE//./,},0" VERSION_STRING="6,99,99,900,0"
DEFAULT_VENDOR_WEB="http://wiki.x.org" DEFAULT_VENDOR_WEB="http://wiki.x.org"
EXTENSION_LIBS='$(top_builddir)/Xext/libXext.la' EXTENSION_LIBS='$(top_builddir)/Xext/libXext.la'
DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la' DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la'
@ -797,8 +797,8 @@ case $host_os in
esac esac
;; ;;
*) *)
AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source]) AC_DEFINE(_POSIX_SOURCE,1,[POSIX-compliant source])
AC_DEFINE(_XOPEN_SOURCE,1,[X/Open-compliant source]) AC_DEFINE(_XOPEN_SOURCE,500,[X/Open-compliant source])
AC_DEFINE(_BSD_SOURCE,1,[BSD-compliant source]) AC_DEFINE(_BSD_SOURCE,1,[BSD-compliant source])
;; ;;
esac esac
@ -861,6 +861,8 @@ AC_OUTPUT([
Makefile Makefile
GL/Makefile GL/Makefile
GL/glx/Makefile GL/glx/Makefile
GL/include/Makefile
GL/include/GL/Makefile
GL/mesa/Makefile GL/mesa/Makefile
GL/mesa/array_cache/Makefile GL/mesa/array_cache/Makefile
GL/mesa/glapi/Makefile GL/mesa/glapi/Makefile

10
hw/xfree86/os-support/solaris/Makefile.am
View File

@ -1,6 +1,6 @@
if SOLARIS_USL_CONSOLE if SOLARIS_USL_CONSOLE
IO_SRC = $(srcdir)/../sysv/sysv_io.c IO_SRC = $(srcdir)/../sysv/sysv_io.c
KBD_SRCS = $(srcdir)/../sysv/sysv_kbd.c $(srcdir)/../shared/std_kbdEv.c KBD_SRCS = $(srcdir)/../shared/sysv_kbd.c $(srcdir)/../shared/std_kbdEv.c
VTSW_SRC = $(srcdir)/../shared/VTsw_usl.c VTSW_SRC = $(srcdir)/../shared/VTsw_usl.c
else else
IO_SRC = sun_io.c IO_SRC = sun_io.c
@ -28,13 +28,15 @@ libsolaris_la_SOURCES = sun_bios.c sun_init.c $(IO_SRC) $(KBD_SRCS) \
$(srcdir)/../shared/kmod_noop.c $(srcdir)/../shared/pm_noop.c \ $(srcdir)/../shared/kmod_noop.c $(srcdir)/../shared/pm_noop.c \
$(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \ $(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \
$(srcdir)/../shared/stdPci.c $(srcdir)/../shared/stdResource.c \ $(srcdir)/../shared/stdPci.c $(srcdir)/../shared/stdResource.c \
$(VTSW_SRC) $(SOLARIS_INOUT_SRC) $(VTSW_SRC)
nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
sdk_HEADERS = agpgart.h solaris-$(SOLARIS_INOUT_ARCH).il sdk_HEADERS = agpgart.h
nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
EXTRA_DIST = sun_inout.s solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S EXTRA_DIST = sun_inout.s solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S

4
hw/xfree86/scanpci/Makefile.am
View File

@ -17,7 +17,9 @@ EXTRA_DIST = \
xf86PciIds.h \ xf86PciIds.h \
xf86PciStdIds.h \ xf86PciStdIds.h \
xf86PciStr.h \ xf86PciStr.h \
xf86ScanPci.h xf86ScanPci.h \
pci.ids \
pciid2c.pl
xf86PciData.c: xf86PciData.c:
echo "#define PCIDATA" > $@ echo "#define PCIDATA" > $@