summaryrefslogtreecommitdiff
authorSPIGOT <root@jerkcity.com>2010-11-02 04:21:14 (GMT)
committer SPIGOT <root@jerkcity.com>2010-11-02 04:21:14 (GMT)
commit231683e2f111bb064125f64f2da797d744cde7fa (patch) (side-by-side diff)
tree80eeb89a3d078854ea44de516a3497bf5b785849
parent80ba041afc5f892c0a91e00746c6b364ddca7fa5 (diff)
downloadxf86-video-radeonhd-spigot.zip
xf86-video-radeonhd-spigot.tar.gz
PERHAPS BONGHITS WILL FIX MY MAKEFILEspigot
Signed-off-by: SPIGOT <root@jerkcity.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile.am38
-rw-r--r--RadeonHD.am35
-rw-r--r--RadeonHD.tmpl39
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.ac392
-rw-r--r--man/Makefile.am54
-rw-r--r--src/Makefile.am206
-rw-r--r--utils/conntest/Makefile.am44
8 files changed, 1 insertions, 819 deletions
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 534c3fd..0000000
--- a/Makefile.am
+++ b/dev/null
@@ -1,38 +0,0 @@
-# Copyright 2007 Luc Verhaegen <libv@exsuse.de>
-# Copyright 2007 Matthias Hopf <mhopf@novell.com>
-# Copyright 2007 Egbert Eich <eich@novell.com>
-# Copyright 2007 Advanced Micro Devices, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-AUTOMAKE_OPTIONS = foreign
-# src before man: src/ may update sources in man/
-SUBDIRS = src man utils/conntest
-
-EXTRA_DIST = RadeonHD.tmpl Imakefile git_version.sh ChangeLog INSTALL
-MAINTAINERCLEANFILES = ChangeLog
-
-.PHONY: ChangeLog
-
-# "git log" with the space should be available since git 1.3.0
-ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
-
-dist-hook: ChangeLog
-
diff --git a/RadeonHD.am b/RadeonHD.am
deleted file mode 100644
index 5c12cf6..0000000
--- a/RadeonHD.am
+++ b/dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2007 Hans Ulrich Niedermann <hun@n-dimensional.de>
-#
-# This Makefile fragment is free software; the author(s) give(s)
-# unlimited permission to copy, distribute and modify it.
-
-# The stamp file which is never created ensures that git_version.h is updated
-# before every build. Having git_version.h in foo_SOURCES ensures a recompile
-# of foo-bar.c if it is newer than the foo-bar.o file. Using noinst_foo_SOURCES
-# instead of foo_SOURCES prevents shipping git_version.h in dist tarballs,
-# which may cause false GIT_FOO readings.
-BUILT_SOURCES += git_version.stamp
-CLEANFILES += git_version.h
-GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh
-git_version.stamp:
- @if test -f "$(srcdir)/git_version.h"; then \
- if test -f "git_version.h"; then :; \
- else \
- cp "$(srcdir)/git_version.h" "git_version.h"; \
- fi; \
- fi
- $(GIT_VERSION_CMD) -k -s $(top_srcdir) -o git_version.h
- @if test -s "$(srcdir)/git_version.h"; then \
- if cmp "$(srcdir)/git_version.h" "git_version.h"; then :; \
- else \
- echo "Error: $(srcdir)/git_version.h and git_version.h differ."; \
- echo " You probably want to remove the former."; \
- exit 1; \
- fi; \
- fi
-
-dist-hook: git_version.stamp
- if test -f "git_version.h"; then \
- $(SED) -e 's|^#undef GIT_IS_DIST.*|#define GIT_IS_DIST 1|' \
- "git_version.h" > "$(distdir)/git_version.h"; \
- fi
diff --git a/RadeonHD.tmpl b/RadeonHD.tmpl
deleted file mode 100644
index 2b798e2..0000000
--- a/RadeonHD.tmpl
+++ b/dev/null
@@ -1,39 +0,0 @@
-/* imake template for radeonhd driver -*- makefile -*- */
-
-/* Copyright (c) 2007 Hans Ulrich Niedermann <hun@n-dimensional.de>
- *
- * This Makefile fragment is free software; the author(s) give(s)
- * unlimited permission to copy, distribute and modify it.
- */
-
-VER_GREP = grep -A 4 AC_INIT $(TOP)/configure.ac
-VER_SED = sed -n '2s/[^0-9]*\([0-9][^,]*\).*/\1/p'
-VER_CUT = cut -d . -f
-PACKAGE_VERSION = `$(VER_GREP) | $(VER_SED)`
-PACKAGE_VERSION_MAJOR = `$(VER_GREP) | $(VER_SED) | $(VER_CUT) 1`
-PACKAGE_VERSION_MINOR = `$(VER_GREP) | $(VER_SED) | $(VER_CUT) 2`
-PACKAGE_VERSION_PATCHLEVEL = `$(VER_GREP) | $(VER_SED) | $(VER_CUT) 3`
-
-PACKAGE_NAME = xf86-video-radeonhd
-
-RHD_VERSION_DEFINES = \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -DPACKAGE_VERSION_MAJOR="$(PACKAGE_VERSION_MAJOR)" \
- -DPACKAGE_VERSION_MINOR="$(PACKAGE_VERSION_MINOR)" \
- -DPACKAGE_VERSION_PATCHLEVEL="$(PACKAGE_VERSION_PATCHLEVEL)"
-
-
-/*
- * The only way to make sure the git version check is run and git_version.h is
- * updated before a compile. Creating a normal make rule cannot do that.
- */
-GIT_VERSION_CMD = $(SHELL) $(TOP)/git_version.sh
-RHD_GIT_DEFINES = \
- `$(GIT_VERSION_CMD) -q -k -s $(TOP) -o git_version.h`
-
-clean::
- RemoveFile(git_version.h)
- RemoveFile(git_version.h.new)
-
-/* vim: syntax=make
- */
diff --git a/autogen.sh b/autogen.sh
index 5216615..2204f59 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,3 @@
#! /bin/sh
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd "$srcdir"
-
-rm -rf autom4te.cache
-autoreconf --force -v --install || exit 1
-cd "$ORIGDIR" || exit $?
-
-"$srcdir"/configure --enable-maintainer-mode "$@"
+echo "It's dead, Jim."
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 4a8fec1..0000000
--- a/configure.ac
+++ b/dev/null
@@ -1,392 +0,0 @@
-# Process this file with autoconf to produce a configure script
-
-AC_PREREQ(2.57)
-AC_INIT([xf86-video-radeonhd],
- 1.3.0,
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/radeonhd],
- xf86-video-radeonhd)
-
-AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR(.)
-
-AM_INIT_AUTOMAKE([dist-bzip2])
-
-AM_MAINTAINER_MODE
-
-AC_CONFIG_FILES([shave shave-libtool])
-
-
-# Program checks.
-AC_DISABLE_STATIC
-AC_PROG_CC
-
-dnl Define SED var without requiring AC_PROG_SED (new in autoconf-2.59b)
-m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_SUBST([SED], [${SED-sed}])])
-
-AC_MSG_CHECKING([whether $SED can substitute tabs and newlines for text])
-dnl One tab, a letter and two newlines
-cat>sed-test.1<<EOF
- y
-
-EOF
-echo x | sed 's/x/\ty\n/' > sed-test.2
-if cmp -s sed-test.1 sed-test.2; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AM_CONDITIONAL([HAVE_SED_WITH_REASONABLE_SUBSTITUTION], [cmp -s sed-test.1 sed-test.2])
-rm -f sed-test.1 sed-test.2
-
-CXX=no
-F77=no
-AC_PROG_LIBTOOL
-
-
-AH_TOP([#ifndef _CONFIG_H])
-AH_TOP([# define _CONFIG_H])
-AH_TOP([# include "xorg-server.h"])
-AH_BOTTOM([#endif])
-
-AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
- [Default xorg module directory (default $libdir/xorg/modules)]),
- [moduledir="$withval"],
- [moduledir="$libdir/xorg/modules"])
-
-AC_ARG_ENABLE(exa,
- AC_HELP_STRING([--disable-exa],
- [Disable EXA support (default enabled)]),
- [EXA="$enableval"],
- [EXA=yes])
-
-AC_ARG_ENABLE(dri,
- AC_HELP_STRING([--disable-dri],
- [Disable DRI support (default enabled)]),
- [DRI="$enableval"],
- [DRI=yes])
-
-# Extensions checks.
-m4_pattern_forbid([XORG_DRIVER_CHECK_EXT])dnl
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-XORG_DRIVER_CHECK_EXT(XV, videoproto)
-XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# @@@@ We don't do DGA any more
-
-# pkg-config packages checks
-# @@@@ need to check for the right server version once RandR 1.2 is in.
-# @@@ do we really need fontsproto here?
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
-PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
- HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
- HAVE_XEXTPROTO_71="no")
-AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
-
-# Header files checks.
-AC_HEADER_STDC
-
-PKG_CHECK_MODULES(PCIUTILS, libpci,,
- [AC_MSG_WARN([libpci not registered in pkgconfig, will guess instead])
- test "x$PCIUTILS_CFLAGS$PCIUTILS_LIBS" = "x" && PCIUTILS_LIBS="-lpci -lz"
-])
-
-SAVED_CPPFLAGS="$CPPFLAGS"
-SAVED_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $PCIUTILS_CFLAGS"
-CPPFLAGS="$CPPFLAGS $PCIUTILS_CFLAGS"
-AC_CHECK_HEADER([pci/pci.h],
- [AC_DEFINE([HAVE_PCI_PCI_H], [1],
- [Define to 1 if you have <pci/pci.h>.])
- have_pci_pci_h=yes],
- [AC_MSG_WARN([Caution: Will not compile rhd_conntest without pciutils headers.])])
-AM_CONDITIONAL([HAVE_PCI_PCI_H], [test "x$have_pci_pci_h" = "xyes"])
-
-# Properly handle EXA.
-CPPFLAGS="$SAVED_CPPFLAGS $XORG_CFLAGS"
-CFLAGS="$SAVED_CFLAGS"
-
-AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
- [#include "xorg-server.h"])
-if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess])
- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
-fi
-AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
-# basic exa check.
-AC_MSG_CHECKING([whether to enable EXA support])
-if test "x$EXA" = xyes; then
- AC_MSG_RESULT(yes)
- AC_CHECK_HEADER(exa.h,
- [have_exa_h="yes"], [have_exa_h="no"])
-else
- AC_MSG_RESULT(no)
-fi
-
-# exa version check.
-if test "x$have_exa_h" = xyes; then
- AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-#include "exa.h"
-#if EXA_VERSION_MAJOR < 2
-#error OLD EXA!
-#endif
- ]])],
- [USE_EXA=yes],
- [USE_EXA=no])
- AC_MSG_RESULT($USE_EXA)
-
- if test "x$USE_EXA" = xyes; then
- AC_DEFINE(USE_EXA, 1, [Build support for Exa])
- fi
-fi
-
-AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
-
-# Handle RandR1.2
-AC_CHECK_HEADER(xf86RandR12.h, [have_randr12="yes"], [have_randr12="no"], [#include <xf86.h>])
-if test "x$have_randr12" = xyes; then
- AC_DEFINE(RANDR_12_SUPPORT, 1, [Build RandR 1.2 Support])
-fi
-
-AC_MSG_CHECKING([whether to enable RandR1.2 support])
-AC_MSG_RESULT($have_randr12)
-
-# Handle DRI
-CPPFLAGS="$SAVED_CPPFLAGS $XORG_CFLAGS"
-CFLAGS="$SAVED_CFLAGS $XORG_CFLAGS"
-
-# basic dri check.
-USE_DRI=no
-if test "x$DRI" = xyes; then
- USE_DRI="yes"
- AC_CHECK_DECL(XF86DRI,, [USE_DRI=no], [#include <xorg-server.h>])
- XORG_CFLAGS="$XORG_CFLAGS $DRI_CFLAGS"
- PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto glproto],, [USE_DRI=no])
-fi
-
-AC_MSG_CHECKING([whether to enable DRI support])
-AC_MSG_RESULT($USE_DRI)
-AM_CONDITIONAL(USE_DRI, test "x$USE_DRI" = xyes)
-
-if test "x$USE_DRI" = "xyes"; then
- AC_DEFINE(USE_DRI, 1, [Build support for DRI])
- CFLAGS="$CFLAGS $DRI_CFLAGS"
- CPPFLAGS="$CPPFLAGS $DRI_CFLAGS"
- AC_CHECK_HEADER([xf86drmMode.h],
- [AC_DEFINE([HAVE_XF86DRMMODE_H], [1],
- [Define to 1 if you have xf86drmMode.h])])
-fi
-
-AC_CHECK_FILE([${sdkdir}/damage.h],
- [AC_DEFINE(DAMAGE,1,[Use Damage extension])], [])
-
-# check for xf86_ansic.h
-CFLAGS="$SAVED_CFLAGS"
-CPPFLAGS="$SAVED_CPPFLAGS"
-
-AC_CHECK_HEADER([${sdkdir}/xf86_ansic.h],
- [AC_DEFINE([HAVE_XF86_ANSIC_H], [1],
- [Define to 1 if you have <${sdkdir}/xf86_ansic.h>.])
- have_xf86_ansic_h=yes])
-AM_CONDITIONAL([HAVE_XF86_ANSIC_H], [test "x$have_xf86_ansic_h" = "xyes"])
-
-SAVED_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $XORG_CFLAGS"
-
-# Check whether MonRec has a reducedblanking member.
-AC_CHECK_MEMBER([MonRec.reducedblanking],
- [MONREC_HAS_REDUCED=yes], [MONREC_HAS_REDUCED=no],
- [#include "${sdkdir}/xf86.h"])
-if test "x$MONREC_HAS_REDUCED" = xyes; then
- AC_DEFINE(MONREC_HAS_REDUCED, 1, [MonRec has member reducedblanking])
-fi
-
-# Check whether MonRec has a maxPixClock member.
-AC_CHECK_MEMBER([MonRec.maxPixClock],
- [MONREC_HAS_BANDWIDTH=yes], [MONREC_HAS_BANDWIDTH=no],
- [#include "${sdkdir}/xf86.h"])
-if test "x$MONREC_HAS_BANDWIDTH" = xyes; then
- AC_DEFINE(MONREC_HAS_BANDWIDTH, 1, [MonRec has member maxPixClock])
-fi
-
-# Check whether xf86CrtcFuncsRec has a set_mode_major member.
-AC_CHECK_MEMBER([xf86CrtcFuncsRec.set_mode_major],
- [XF86CRTCFUNCS_HAS_SETMODEMAJOR=yes], [XF86CRTCFUNCS_HAS_SETMODEMAJOR=no],
- [#include "${sdkdir}/xorg-server.h"
-#include "${sdkdir}/xf86.h"
-#include "${sdkdir}/xf86Crtc.h"])
-if test "x$XF86CRTCFUNCS_HAS_SETMODEMAJOR" = xyes; then
- AC_DEFINE(XF86CRTCFUNCS_HAS_SETMODEMAJOR, 1, [xf86CrtcFuncsRec has member set_mode_major])
-fi
-
-AC_CHECK_DECL(xf86RotateFreeShadow,
- [AC_DEFINE(HAVE_FREE_SHADOW, 1, [have RotateFreeShadow API])],
- [],
- [#include <xorg-server.h>
- #include <windowstr.h>
- #include <xf86Crtc.h>])
-
-AC_CHECK_DECL(pci_device_enable,
- [AC_DEFINE(HAVE_PCI_DEVICE_ENABLE, 1, [Have pci_device_enable prototype])],
- [],
- [#include <pciaccess.h>])
-
-CFLAGS="$SAVED_CFLAGS"
-
-AC_ARG_ENABLE(atombios, AC_HELP_STRING([--disable-atombios],
- [Disable AtomBIOS support [[default=no]]]),
- [do_atombios="$enableval"],
- [do_atombios=yes])
-
-AC_ARG_ENABLE(atombios-parser, AC_HELP_STRING([--disable-atombios-parser],
- [Disable AtomBIOS parser support [[default=no]]]),
- [do_atombios_parser="$enableval"],
- [do_atombios_parser=yes])
-
-AC_CHECK_FILE([${srcdir}/src/AtomBios/includes/atombios.h],
- [have_atombios_h="yes"], [have_atombios_h="no"])
-
-AC_CHECK_FILE([${srcdir}/src/AtomBios/includes/Decoder.h],
- [have_atombios_parser="yes"], [have_atombios_parser="no"])
-
-AC_MSG_CHECKING([whether to include AtomBIOS])
-if test "$have_atombios_h" = yes -a \
- "$do_atombios" = yes; then
- support_atombios="yes"
- AC_DEFINE(ATOM_BIOS, 1, [Add support for AtomBIOS tables])
-else
- support_atombios="no"
-fi
-
-AC_MSG_RESULT([$support_atombios])
-
-AC_MSG_CHECKING([whether to include AtomBIOS parser])
-if test "$support_atombios" = yes -a \
- "$do_atombios_parser" = yes -a \
- "$have_atombios_parser" = yes; then
- support_atombios_parser="yes"
- AC_DEFINE(ATOM_BIOS_PARSER, 1, [Add support for AtomBIOS code])
-else
- support_atombios_parser="no"
-fi
-
-AC_MSG_RESULT([$support_atombios_parser])
-
-AM_CONDITIONAL(ATOM_BIOS, test x$support_atombios = xyes)
-
-AM_CONDITIONAL(ATOM_BIOS_PARSER, test x$support_atombios_parser = xyes)
-
-# libraries checks.
-AC_CHECK_LIB([z], [gzopen], [have_zlib=yes], [have_zlib=no])
-AM_CONDITIONAL([HAVE_ZLIB], [test "x$have_zlib" = "xyes"])
-
-# compiler flags
-
-dnl AC_PROG_CC_FLAG(flag,action-if-found,action-if-not-found)
-AC_DEFUN([AC_PROG_CC_FLAG],[
- AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]])])
- AC_MSG_CHECKING([whether $CC supports $1])
- if $CC $1 -c -o /dev/null conftest.c >/dev/null 2>&1 ; then
- AC_MSG_RESULT([yes])
- $2
- else
- AC_MSG_RESULT([no])
- $3
- fi
-])
-
-# Extra Warnings
-# Due to xorg/os.h: -Wno-variadic-macros
-# For testing: make CFLAGS="-O2 -Wshadow -Wunreachable-code -fno-inline-functions"
-WARN_CFLAGS=""
-for w in \
- -Wall \
- -Wextra -Wno-unused-parameter \
- -Werror-implicit-function-declaration \
- -Wstrict-aliasing -Wstrict-overflow \
- -Wpointer-arith -Woverlength-strings -Wvolatile-register-var \
- -Winit-self -Wbad-function-cast \
- -Wstrict-prototypes -Wold-style-definition \
- -Wnested-externs -Wdisabled-optimization \
- -Wno-unknown-pragmas ;
-do
- AC_PROG_CC_FLAG($w,[WARN_CFLAGS="$WARN_CFLAGS $w"],)
-done
-
-# atombios.h prohibits -std=c99 due to unnamed unions
-PEDANTIC_CFLAGS=""
-for w in -Wno-long-long -Wno-variadic-macros ; do
- AC_PROG_CC_FLAG($w,[PEDANTIC_CFLAGS="$PEDANTIC_CFLAGS $w"],)
-done
-
-# AtomBios special flags
-ATOMBIOS_CFLAGS=""
-for w in -Wno-unknown-pragmas ; do
- AC_PROG_CC_FLAG($w,[ATOMBIOS_CFLAGS="$ATOMBIOS_CFLAGS $w"],)
-done
-
-# Optimizations
-case "x$CFLAGS" in
-dnl Automake needs extra escaping
- [*-O[2-9]*)]
- AC_MSG_NOTICE([Doing optimized build, checking for additional options])
- for w in -finline-functions ; do
- AC_PROG_CC_FLAG($w,[CFLAGS="$CFLAGS -finline-functions"],)
- done
- ;;
-esac
-
-# Substitute
-
-AC_SUBST([PCIUTILS_CFLAGS])
-AC_SUBST([PCIUTILS_LIBS])
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([DRI_CFLAGS])
-AC_SUBST([WARN_CFLAGS])
-AC_SUBST([PEDANTIC_CFLAGS])
-AC_SUBST([ATOMBIOS_CFLAGS])
-AC_SUBST([RANDR_VERSION],[`pkg-config --modversion randrproto`])
-AC_SUBST([moduledir])
-
-DRIVER_NAME=radeonhd
-AC_SUBST([DRIVER_NAME])
-
-m4_pattern_forbid([XORG_MANPAGE_SECTIONS])dnl
-XORG_MANPAGE_SECTIONS
-m4_pattern_forbid([XORG_RELEASE_VERSION])dnl
-XORG_RELEASE_VERSION
-
-dnl These are also defined in XORG_RELEASE_VERSION since 2006-11-30.
-dnl So we check whether XORG_RELEASE_VERSION has already done this
-dnl for us.
-if test "x$PVM$PVP" = "x"; then
-AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
- [$(echo $PACKAGE_VERSION | cut -d . -f 1)],
- [Major Version])
-AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
- [$(echo $PACKAGE_VERSION | cut -d . -f 2)],
- [Minor Version])
-AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
- [$(echo $PACKAGE_VERSION | cut -d . -f 3)],
- [Patchlevel Version])
-fi
-
-SHAVE_INIT(.,enable)
-
-AC_OUTPUT([
- Makefile
- man/Makefile
- src/Makefile
- utils/conntest/Makefile
-])
-if test "x$USE_DRI" != xyes ; then
- echo ""
- echo "NOTE: DRI support is disabled"
- echo ""
-fi
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 38c5643..0000000
--- a/man/Makefile.am
+++ b/dev/null
@@ -1,54 +0,0 @@
-# $Id$
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-
-drivermandir = $(DRIVER_MAN_DIR)
-
-driverman_PRE = @DRIVER_NAME@.man
-
-driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-
-EXTRA_DIST = @DRIVER_NAME@.man Imakefile
-
-CLEANFILES = $(driverman_DATA)
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
-.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 49429f9..0000000
--- a/src/Makefile.am
+++ b/dev/null
@@ -1,206 +0,0 @@
-BUILT_SOURCES =
-CLEANFILES =
-include $(top_srcdir)/RadeonHD.am
-
-EXTRA_DIST = Imakefile
-
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @WARN_CFLAGS@
-
-driversdir = ${moduledir}/drivers
-drivers_LTLIBRARIES = radeonhd_drv.la
-
-radeonhd_drv_la_LDFLAGS = -module -avoid-version
-radeonhd_drv_la_CFLAGS = $(AM_CFLAGS) @PEDANTIC_CFLAGS@
-radeonhd_drv_la_LIBADD =
-
-if XSERVER_LIBPCIACCESS
-radeonhd_drv_la_LIBADD += @PCIACCESS_LIBS@
-endif
-
-radeonhd_drv_la_SOURCES = \
- atombios_rev.h \
- r5xx_3dregs.h \
- r5xx_accel.c \
- r5xx_accel.h \
- r5xx_regs.h \
- r5xx_xaa.c \
- r600_reg.h \
- r600_reg_auto_r6xx.h \
- r600_reg_r6xx.h \
- r600_reg_r7xx.h \
- r600_shader.h \
- r600_shader.c \
- r600_state.h \
- radeon_3d.c \
- radeon_textured_videofuncs.c \
- rhd_atombios.c \
- rhd_atombios.h \
- rhd_atomcrtc.c \
- rhd_atomout.c \
- rhd_atomout.h \
- rhd_atompll.c \
- rhd_audio.c \
- rhd_audio.h \
- rhd_biosscratch.c \
- rhd_biosscratch.h \
- rhd_card.h \
- rhd_connector.c \
- rhd_connector.h \
- rhd_crtc.c \
- rhd_crtc.h \
- rhd_cs.c \
- rhd_cs.h \
- rhd_cursor.c \
- rhd_cursor.h \
- rhd_dac.c \
- rhd_ddia.c \
- rhd_dig.c \
- rhd_driver.c \
- rhd_edid.c \
- rhd.h \
- rhd_hdmi.c \
- rhd_hdmi.h \
- rhd_helper.c \
- rhd_i2c.c \
- rhd_i2c.h \
- rhd_id.c \
- rhd_lut.c \
- rhd_lut.h \
- rhd_lvtma.c \
- rhd_mc.c \
- rhd_mc.h \
- rhd_modes.c \
- rhd_modes.h \
- rhd_monitor.c \
- rhd_monitor.h \
- rhd_output.c \
- rhd_output.h \
- rhd_pll.c \
- rhd_pll.h \
- rhd_pm.c \
- rhd_pm.h \
- rhd_randr.c \
- rhd_randr.h \
- rhd_regs.h \
- rhd_shadow.c \
- rhd_shadow.h \
- rhd_tmds.c \
- rhd_vga.c \
- rhd_vga.h \
- rhd_video.c \
- rhd_video.h \
- rhd_acpi.c \
- rhd_acpi.h
-
-nodist_radeonhd_drv_la_SOURCES = \
- git_version.h
-
-if USE_EXA
-radeonhd_drv_la_SOURCES += r5xx_exa.c radeon_exa_render.c
-endif
-
-if USE_DRI
-radeonhd_drv_la_SOURCES += rhd_dri.c rhd_dri.h radeon_dri.h radeon_drm.h
-radeonhd_drv_la_SOURCES += r6xx_accel.c r6xx_accel.h
-radeonhd_drv_la_SOURCES += r600_exa.c r600_textured_videofuncs.c
-radeonhd_drv_la_LIBADD += @DRI_LIBS@
-endif
-
-if ATOM_BIOS
-radeonhd_drv_la_SOURCES += \
- AtomBios/includes/atombios.h
-
-INCLUDES = -I$(srcdir)/AtomBios/includes
-
-endif
-
-if ATOM_BIOS_PARSER
-radeonhd_drv_la_SOURCES += \
- rhd_atomwrapper.h
-endif
-
-if ATOM_BIOS_PARSER
-
-noinst_LTLIBRARIES = libatom.la
-libatom_la_CFLAGS = $(AM_CFLAGS) @ATOMBIOS_CFLAGS@ -DDRIVER_PARSER -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS
-# libatom_la_LDFLAGS = -module -avoid-version
-
-libatom_la_SOURCES = \
- rhd_atomwrapper.c \
- rhd_atomwrapper.h \
- AtomBios/CD_Operations.c \
- AtomBios/Decoder.c \
- AtomBios/hwserv_drv.c \
- AtomBios/includes/atombios.h \
- AtomBios/includes/CD_binding.h \
- AtomBios/includes/CD_Common_Types.h \
- AtomBios/includes/CD_Definitions.h \
- AtomBios/includes/CD_hw_services.h \
- AtomBios/includes/CD_Opcodes.h \
- AtomBios/includes/CD_Structs.h \
- AtomBios/includes/Decoder.h \
- AtomBios/includes/ObjectID.h \
- AtomBios/includes/regsdef.h
-
-radeonhd_drv_la_LIBADD += libatom.la
-
-endif
-
-if MAINTAINER_MODE
-if HAVE_SED_WITH_REASONABLE_SUBSTITUTION
-SRCMAN = $(top_srcdir)/man/radeonhd.man
-CLEANFILES += radeonhd.man.new
-radeonhd.man.new: rhd_id.c $(SRCMAN)
- $(Q)( $(SED) -n '1,/^\.\\" START_DEVICE_LIST marker - do not delete/p' "$(SRCMAN)"; \
- $(SED) -e '1,/^[ ]*\/\* START_DEVICE_LIST marker - do not delete \*\/ *$$/d' \
- -e '/^[ ]*\/\* END_DEVICE_LIST marker - do not delete \*\/ *$$/,$$d' \
- -e '/^[ ]\{1,\}xf86Msg(X_NONE,/d' \
- -e '/^[ ]\{1,\}\/\*/d' \
- -e 's/^[ ]\{1,\}"\\t\([A-Z0-9]\{1,\}\) \{1,\}: \(.*;\)\\n"$$/.TP 8\n.B \1\n\2/' \
- -e 's/^[ ]\{1,\}"\\t\\t\(.*\)\.\\n"\();\)\{0,1\}$$/\1/' \
- -e 's/^[ ]\{1,\}"\\t\([A-Z0-9]\{1,\}\) \{1,\}: \(.*\)\.\\n"\();\)\{0,1\}$$/.TP 8\n.B \1\n\2/' \
- "$(srcdir)/rhd_id.c"; \
- $(SED) -n '/^\.\\" END_DEVICE_LIST marker - do not delete/,$$p' "$(SRCMAN)" \
- ) > radeonhd.man.new
-
-SRCREADME = $(top_srcdir)/README
-CLEANFILES += README.new
-README.new: rhd_id.c $(top_srcdir)/README
- $(Q)( $(SED) -n '1,/^BEGIN_DEVICE_LIST$$/p' "$(SRCREADME)"; \
- $(SED) -e '1,/^[ ]*\/\* START_DEVICE_LIST marker - do not delete \*\/ *$$/d' \
- -e '/^[ ]*\/\* END_DEVICE_LIST marker - do not delete \*\/ *$$/,$$d' \
- -e '/^[ ]\{1,\}xf86Msg(X_NONE,/d' \
- -e '/^[ ]\{1,\}\/\*/d' \
- -e 's/^[ ]\{1,\}"\\t\([A-Z0-9]\{1,\}\) \{1,\}: \(.*;\)\\n"$$/ * \1:\t\2/' \
- -e 's/^[ ]\{1,\}"\\t\\t\(.*\)\.\\n"\();\)\{0,1\}$$/ \t\1/' \
- -e 's/^[ ]\{1,\}"\\t\([A-Z0-9]\{1,\}\) \{1,\}: \(.*\)\.\\n"\();\)\{0,1\}$$/ * \1:\t\2/' \
- "$(srcdir)/rhd_id.c"; \
- $(SED) -n '/^END_DEVICE_LIST$$/,$$p' "$(SRCREADME)" \
- ) > README.new
-
-# Update man page and README from rhd_id.c RHDIdentify() output.
-# The exit(1) makes sure the updates do not go unnoticed.
-all-local: radeonhd.man.new README.new
- @changed=""; \
- if diff -u "$(SRCMAN)" radeonhd.man.new; then \
- if test "x$(Q)" = "x@"; then :; else echo "radeon(4) man page is current."; fi \
- else \
- changed="$$changed $(SRCMAN)"; \
- mv -f radeonhd.man.new "$(SRCMAN)"; \
- fi; \
- if diff -u "$(SRCREADME)" README.new; then \
- if test "x$(Q)" = "x@"; then :; else echo "README file is current."; fi \
- else \
- changed="$$changed $(SRCREADME)"; \
- mv -f README.new "$(SRCREADME)"; \
- fi; \
- if test "x$$changed" = "x"; then :; else \
- echo "WARNING: Due to changes to src/rhd_id.c, some files differ from the original ones."; \
- echo " Please verify the changes to the following files"; \
- for f in $$changed; do echo " $$f"; done; \
- echo " and commit them together with your changes to"; \
- echo " $(srcdir)/rhd_id.c"; \
- exit 1; \
- fi
-endif
-endif
diff --git a/utils/conntest/Makefile.am b/utils/conntest/Makefile.am
deleted file mode 100644
index 48fafbe..0000000
--- a/utils/conntest/Makefile.am
+++ b/dev/null
@@ -1,44 +0,0 @@
-BUILT_SOURCES =
-CLEANFILES =
-include $(top_srcdir)/RadeonHD.am
-
-EXTRA_DIST = README Imakefile
-
-EXTRA_PROGRAMS = rhd_conntest rhd_dump
-
-if XSERVER_LIBPCIACCESS
-noinst_PROGRAMS = rhd_conntest rhd_dump
-endif
-
-if HAVE_PCI_PCI_H
-if HAVE_ZLIB
-noinst_PROGRAMS = rhd_conntest rhd_dump
-endif
-endif
-
-all-local:
- @if test "x$(noinst_PROGRAMS)" = "x"; then \
- echo "WARNING: Cannot build the rhd_conntest program due to missing dependencies."; \
- echo " *IF* you want to build rhd_conntest, install development packages of"; \
- echo " both pciutils and zlib/libz and re-run the configure (or autogen) script."; \
- fi
-
-# Including config.h requires xorg-config.h, so we need the XORG_CFLAGS here
-AM_CFLAGS = @XORG_CFLAGS@ @WARN_CFLAGS@ @PCIUTILS_CFLAGS@
-AM_CPPFLAGS = -I$(top_srcdir)/src/AtomBios/includes
-
-rhd_conntest_SOURCES = rhd_conntest.c
-nodist_rhd_conntest_SOURCES = git_version.h
-if XSERVER_LIBPCIACCESS
-rhd_conntest_LDADD = @PCIACCESS_LIBS@
-else
-rhd_conntest_LDADD = @PCIUTILS_LIBS@
-endif
-
-rhd_dump_SOURCES = rhd_dump.c
-nodist_rhd_dump_SOURCES = git_version.h
-if XSERVER_LIBPCIACCESS
-rhd_dump_LDADD = @PCIACCESS_LIBS@
-else
-rhd_dump_LDADD = @PCIUTILS_LIBS@
-endif