From dc32739681307e544554642222c51611bafa6274 Mon Sep 17 00:00:00 2001 From: Aaron Chen Date: Wed, 1 Aug 2012 17:15:19 +0800 Subject: [PATCH 4/4] new driver initial patch 4 Delete useless files. Signed-off-by: Aaron Chen --- Makefile.am | 11 +++---- configure.ac | 94 ++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 48 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1bb47d9..d79e354 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,17 +18,16 @@ # 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 SUBDIRS = src man -MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = CALLMAP Release.txt +EXTRA_DIST = ChangeLog CALLMAP Release.txt -.PHONY: ChangeLog INSTALL +MAINTAINERCLEANFILES=ChangeLog -INSTALL: - $(INSTALL_CMD) +.PHONY: ChangeLog ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog INSTALL +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index da5ecfd..094b4fd 100644 --- a/configure.ac +++ b/configure.ac @@ -20,50 +20,64 @@ # # Process this file with autoconf to produce a configure script -# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-siliconmotion], - [1.7.7], + 4.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion], - [xf86-video-siliconmotion]) + xf86-video-siliconmotion) -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS +# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and +# XORG_CHANGELOG macros +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1.6 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.1.6) AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_HEADERS([config.h]) +AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -# Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE -# Initialize libtool +# Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL +AC_PROG_CC AH_TOP([#include "xorg-server.h"]) -# Define a configure option for an alternate module directory AC_ARG_WITH(xorg-module-dir, - AS_HELP_STRING([--with-xorg-module-dir=DIR], + AC_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -# Store the list of server defined optional extensions in REQUIRED_MODULES + + +# Checks for extensions +XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + +AC_ARG_ENABLE([smirandr], + [AS_HELP_STRING([--enable-smirandr], + [enable X RandR feature for Silicon Motion (default=yes)])], + [enable_smirandr=$enableval], + [enable_smirandr=yes] + ) + +AS_IF([test "x$_EXT_CHECK" == "xno"], + [enable_smirandr=no],[]) + +AS_IF([test "x$enable_smirandr" != "xno"], + [AC_DEFINE([SMI_RANDR], [1], [Define SMI_RANDR to support X RandR])], + [AC_DEFINE([SMI_RANDR], [0], [Define SMI_RANDR to support X Randr])]) + +XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) -# Obtain compiler/linker options for the driver dependencies +# Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 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) # Checks for libraries. SAVE_CPPFLAGS="$CPPFLAGS" @@ -75,8 +89,12 @@ AC_CHECK_HEADER(xf86Modes.h, [XMODES=yes], [XMODES=no], [#include "xorg-server.h"]) CPPFLAGS="$SAVE_CPPFLAGS" +# Checks for header files. +AC_HEADER_STDC + if test "x$XSERVER_LIBPCIACCESS" = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) + XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) AM_CONDITIONAL(XMODES, test "x$XMODES" = xyes) @@ -84,32 +102,24 @@ AM_CONDITIONAL(XMODES, test "x$XMODES" = xyes) if test "x$XMODES" = xyes; then AC_DEFINE(HAVE_XMODES, 1, [X server has new mode code]) fi -AC_ARG_ENABLE(xaa, - AS_HELP_STRING([--enable-xaa], - [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), - [XAA="$enableval"], - [XAA=auto]) -if test "x$XAA" != xno; then - save_CFLAGS=$CFLAGS - save_CPPFLAGS=$CPPFLAGS - CFLAGS=$XORG_CFLAGS - CPPFLAGS="$XORG_CFLAGS" - AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) - CFLAGS=$save_CFLAGS - CPPFLAGS=$save_CPPFLAGS -fi -AC_MSG_CHECKING([whether to include XAA support]) -AM_CONDITIONAL(XAA, test "x$XAA" = xyes) -AC_MSG_RESULT([$XAA]) +XORG_CWARNFLAGS +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" +AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) DRIVER_NAME=siliconmotion AC_SUBST([DRIVER_NAME]) -AC_CONFIG_FILES([ - Makefile - src/Makefile - man/Makefile +XORG_MANPAGE_SECTIONS +XORG_RELEASE_VERSION +XORG_CHANGELOG + +AC_OUTPUT([ + Makefile + src/Makefile + src/ddk712/Makefile + src/ddk750/Makefile + src/ddk502/Makefile + man/Makefile ]) -AC_OUTPUT -- 1.7.5.4