[PATCH 2/3] Janitor: make distcheck, .gitignore.
Paulo Cesar Pereira de Andrade
pcpa at mandriva.com.br
Fri Feb 6 14:10:15 PST 2009
Use `` instead of $().
Use $PKG_CONFIG to honor user build setup.
Replace ChangeLog with automatically generated version.
Use XORG_CWARNFLAGS to help find driver problems.
Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
.gitignore | 6 +++++
ChangeLog | 59 -------------------------------------------------------
Makefile.am | 10 ++++++++-
configure.ac | 11 ++++++---
src/Makefile.am | 3 +-
5 files changed, 24 insertions(+), 65 deletions(-)
delete mode 100644 ChangeLog
diff --git a/.gitignore b/.gitignore
index 2df4a8d..8a4a446 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-cyrix-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 344113a..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,59 +0,0 @@
-2006-04-06 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- * src/cyrix.h:
- * src/cyrix_accel.c:
- * src/cyrix_bank.c:
- * src/cyrix_driver.c:
- * src/cyrix_helper.c:
- * src/cyrix_shadow.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
- * src/cyrix_driver.c:
- VERSION -> CYRIX_VERSION
-
-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-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Add check for DGA extension to fix issues when building with
- separate build roots.
-
-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 a6fc9ae..b456381 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,9 @@ AC_INIT([xf86-video-cyrix],
xf86-video-cyrix)
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(XFreeXDGA, xf86dgaproto)
# 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`
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
@@ -70,14 +75,12 @@ CFLAGS="$save_CFLAGS"
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([moduledir])
-
DRIVER_NAME=cyrix
AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
XORG_CHECK_LINUXDOC
diff --git a/src/Makefile.am b/src/Makefile.am
index 778e7cc..6209cb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,8 @@
# -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)
+
cyrix_drv_la_LTLIBRARIES = cyrix_drv.la
cyrix_drv_la_LDFLAGS = -module -avoid-version
cyrix_drv_ladir = @moduledir@/drivers
--
1.6.1
------=_20090206205756_92234--
More information about the xorg-devel
mailing list