>From b91bad5c82321cfd43872befd75041718d5c9a40 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade <[email protected]> Date: Thu, 5 Feb 2009 18:43:55 -0200 Subject: [PATCH 1/2] Janitor: make distcheck, .gitignore.
Use `` instead of $(). Use $PKG_CONFIG to honor user build setup. Replace ChangeLog with automatically generated version, this is also the "make distcheck" correction. Use XORG_CWARNFLAGS to help find driver problems. Add back the executable bit to autogen.sh. Use a single .gitignore file. Signed-off-by: Paulo Cesar Pereira de Andrade <[email protected]> --- .gitignore | 5 ++ ChangeLog | 170 ------------------------------------------------------- Makefile.am | 11 +++- configure.ac | 14 ++-- src/.gitignore | 6 -- src/Makefile.am | 2 +- 6 files changed, 23 insertions(+), 185 deletions(-) delete mode 100644 ChangeLog mode change 100644 => 100755 autogen.sh delete mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore index 2df4a8d..2bb4cad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.deps +.libs Makefile Makefile.in *.la @@ -18,3 +20,6 @@ ltmain.sh missing stamp-h1 *~ +xf86-video-ast-*.tar.* +ChangeLog +tags diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 5ea7df7..0000000 --- a/ChangeLog +++ /dev/null @@ -1,170 +0,0 @@ -2009-01-16 Y.C. Chen <[email protected]> - * src/ast_driver.c - - Fixed Support Modes Incorrect Issues on Solaris 10 x86 - -2009-01-08 Y.C. Chen >[email protected]> - * src/ast.h - * src/ast_driver.c - * src/ast_2dtool.c, ast_2dtool.h - * src/ast_accel.c - * src/ast_cursor.c - * src/ast_mode.c - * src/ast_vgatool.c - - Support AST2200/2150 - - Support ASPEED Graphics as Secondary - - Fixed AST1100 1280x1024x32bpp thershold issue - - Fixed Screen saver - celtic, DecayScreen abnormal issues - - Fixed Game - Potato Guys abnormal issue - -2008-08-22 Y.C. Chen <[email protected]> - * src/ast.h - * src/ast_driver.c - * src/ast_vgatool.c, ast_vgatool.h - Support AST1100/2050/2100 - - * src/ast_mode.c ast_mode.h - Modify the display timing of 1920x1200 to reduce blanking timing - - * src/ast_driver.c - * src/ast_vgatool.c - Support Clone Display for Two VGA - -2008-07-21 Y.C. Chen <[email protected]> - * src/ast_mode.c - Fixed Incorrect Settings for Graphices Registers - -2008-03-18 Y.C. Chen <[email protected]> - * src/ast_2dtool.c - * src/ast_tool.c - Compiler Warning Fixed - -2008-03-01 Y.C. Chen <[email protected]> - * src/ast_driver.c: - Add _X_EXPORT for symbols public visibility - -2007-08-24 Y.C. Chen <[email protected]> - - * configure.ac: - * src/ast.h: - * src/ast_2dtool.c: - * src/ast_accel.c: - * src/ast_cursor.c: - * src/ast_driver.c: - * src/ast_mode.c: - * src/ast_tool.c: - * src/ast_vgatool.c: - * src/ast_2dtool.h - * src/ast_mode.h: - Support AST2100 - -2006-04-17 Y.C. Chen <[email protected]> - - * src/ast_vgatool.c: (GetMaxDCLK): - Fixed can't get correct MCLK in some platforms - -2006-04-07 Adam Jackson <[email protected]> - - * configure.ac: - * src/ast.h: - * src/ast_2dtool.c: - * src/ast_accel.c: - * src/ast_cursor.c: - * src/ast_driver.c: - * src/ast_mode.c: - * src/ast_tool.c: - * src/ast_vgatool.c: - Unlibcwrap. Bump server version requirement. Bump to 0.81.0. - -2006-03-15 Alan Coopersmith <[email protected]> - - * src/ast.h: - * src/ast_2dtool.c: - * src/ast_accel.c: - Update from ASPEED Technology Inc. to fix incorrect line drawing issue - and change driver name from "AST1000/2000" to "AST" to fix Xorg log - formatting issues with long driver names. - Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937> - Attachment #4948 <https://bugs.freedesktop.org/attachment.cgi?id=4948> - -2006-03-14 Alan Coopersmith <[email protected]> - - * COPYING: - * autogen.sh: - * configure.ac: - * Makefile.am: - * src/Makefile.am: - * .cvsignore: - * src/.cvsignore: - Add the normal trappings of the Xorg modular build system. - - * src/ast_2dtool.c: - * src/ast_accel.c: - * src/ast_cursor.c: - * src/ast_driver.c: - * src/ast_mode.c: - * src/ast_tool.c: - * src/ast_vgatool.c: - Replace "Xv.h" with <X11/extensions/Xv.h> and add - #include "config.h" for modular build - Strip ^M out of ast_accel.c - -2006-03-14 Alan Coopersmith <[email protected]> - - * src/ast.h: - * src/ast_2dtool.c: - * src/ast_2dtool.h: - * src/ast_accel.c: - * src/ast_driver.c: - * src/ast_vgatool.c: - Version 0.80 from ASPEED Technology Inc. - (Fixed abnormal display if set 2D Acceleration Option as MMIO mode) - Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937> - Attachment #4932 <https://bugs.freedesktop.org/attachment.cgi?id=4932> - -2006-03-14 Alan Coopersmith <[email protected]> - - * src/ast.h: - * src/ast_driver.c: - * src/ast_vgatool.c: - Version 0.62 from ASPEED Technology Inc. - (Fixed get video buffer size incorrect issue) - Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937> - Attachment #4563 <https://bugs.freedesktop.org/attachment.cgi?id=4563> - -2006-03-14 Alan Coopersmith <[email protected]> - - * src/ast.h: - * src/ast_accel.c: - * src/ast_driver.c: - Version 0.61 from ASPEED Technology Inc. - (Update for Xorg 6.9.0 - Can't reference XAACOPYROP) - Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937> - Attachment #4044 <https://bugs.freedesktop.org/attachment.cgi?id=4245> - -2006-03-14 Alan Coopersmith <[email protected]> - - * src/ast.h: - * src/ast_cursor.c: - * src/ast_cursor.h: - Version 0.60 from ASPEED Technology Inc. - (Modify H/W cursor parts for customer request) - Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937> - Attachment #4044 <https://bugs.freedesktop.org/attachment.cgi?id=4044> - -2006-03-14 Alan Coopersmith <[email protected]> - - * src/ast.h: - * src/ast_2dtool.c: - * src/ast_2dtool.h: - * src/ast_accel.c: - * src/ast_cursor.c: - * src/ast_cursor.h: - * src/ast_driver.c: - * src/ast_mode.c: - * src/ast_mode.h: - * src/ast_tool.c: - * src/ast_vgatool.c: - * src/ast_vgatool.h: - Initial code release from ASPEED Technology Inc. (Version 0.51) - Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937> - Attachment #3686 <https://bugs.freedesktop.org/attachment.cgi?id=3686> diff --git a/Makefile.am b/Makefile.am index 018155e..c39ae5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,4 +19,13 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AUTOMAKE_OPTIONS = foreign -SUBDIRS = src \ No newline at end of file +SUBDIRS = src +EXTRA_DIST = ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/autogen.sh b/autogen.sh old mode 100644 new mode 100755 diff --git a/configure.ac b/configure.ac index 167c1cc..d59537c 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,9 @@ AC_INIT([xf86-video-ast], xf86-video-ast) AC_CONFIG_SRCDIR([Makefile.am]) +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) @@ -38,6 +41,7 @@ AM_MAINTAINER_MODE AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -46,6 +50,7 @@ AC_ARG_WITH(xorg-module-dir, [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) +AC_SUBST(moduledir) # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) @@ -55,7 +60,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) +sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` # Checks for libraries. SAVE_CPPFLAGS="$CPPFLAGS" @@ -74,14 +79,9 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) -AC_SUBST([XORG_CFLAGS]) -AC_SUBST([moduledir]) - -DRIVER_NAME=nv -AC_SUBST([DRIVER_NAME]) - XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 9730646..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo diff --git a/src/Makefile.am b/src/Makefile.am index 4cd7075..70347ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) ast_drv_la_LTLIBRARIES = ast_drv.la ast_drv_la_LDFLAGS = -module -avoid-version -- 1.6.1
_______________________________________________ xorg mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/xorg
