[PATCH] Janitor: make distcheck, compile warnings, .gitignore.
Paulo Cesar Pereira de Andrade
pcpa at mandriva.com.br
Mon Feb 9 11:14:35 PST 2009
Use a single .gitignore file, and remove .cvsignore ones.
Replace ChangeLog with automatically generated one.
Use same pattern for $moduledir and $sdkdir, that works with
make distcheck.
Use XORG_CWARNFLAGS to help find driver problems.
Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
.gitignore | 6 ++++++
ChangeLog | 45 ---------------------------------------------
Makefile.am | 10 +++++++++-
configure.ac | 34 ++++++++++------------------------
man/.cvsignore | 2 --
man/Makefile.am | 4 ++--
src/.cvsignore | 6 ------
src/Makefile.am | 2 +-
src/i128_driver.c | 2 +-
9 files changed, 29 insertions(+), 82 deletions(-)
delete mode 100644 ChangeLog
delete mode 100644 man/.cvsignore
delete mode 100644 src/.cvsignore
diff --git a/.gitignore b/.gitignore
index 2df4a8d..1f40fc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
Makefile
Makefile.in
*.la
@@ -18,3 +20,7 @@ ltmain.sh
missing
stamp-h1
*~
+*.4
+xf86-video-i128-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 64c7900..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Eric Anholt <anholt at FreeBSD.org>
-
- * src/i128_driver.c: (I128PreInit):
- Don't forget to zero the xf86ModReqInfo before using it.
- Noticed by Alex Deucher.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 2b6c46a..216830c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,4 +26,12 @@ README: README.sgml
$(MAKE_TEXT) README.sgml && mv README.txt README
endif
-EXTRA_DIST = README.sgml
+EXTRA_DIST = README.sgml ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 6002fc5..b5ae6de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,9 @@ AC_INIT([xf86-video-i128],
xf86-video-i128)
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,14 +41,13 @@ AM_MAINTAINER_MODE
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
-
-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"])
+moduledir="$libdir/xorg/modules"
+sdkdir="$includedir/xorg"
+AC_SUBST(moduledir)
+AC_SUBST(sdkdir)
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -54,37 +56,21 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, xorg-server xproto fontsproto $REQUIRED_MODULES [pciaccess >= 0.8.0])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
- [#include "xorg-server.h"])
AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
CPPFLAGS="$SAVE_CPPFLAGS"
-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)
-
# Checks for header files.
AC_HEADER_STDC
-
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([moduledir])
-
-DRIVER_NAME=i128
-AC_SUBST([DRIVER_NAME])
-
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
-
+XORG_CHANGELOG
XORG_CHECK_LINUXDOC
AC_OUTPUT([
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..77891e2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -26,11 +26,11 @@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME at .man
+driverman_PRE = i128.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME at .man
+EXTRA_DIST = i128.man
CLEANFILES = $(driverman_DATA)
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/Makefile.am b/src/Makefile.am
index d7ff091..2531f1f 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)
i128_drv_la_LTLIBRARIES = i128_drv.la
i128_drv_la_LDFLAGS = -module -avoid-version
i128_drv_ladir = @moduledir@/drivers
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 72a69e7..14a36b0 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -2061,7 +2061,7 @@ I128getDDC(ScrnInfoPtr pScrn)
*
* Sets VESA Display Power Management Signaling (DPMS) Mode.
*/
-void
+static void
I128DisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode,
int flags)
{
--
1.6.1
------=_20090209174510_90447--
More information about the xorg-devel
mailing list