[PATCH] Janitor: make distcheck, build simplification.
Paulo Cesar Pereira de Andrade
pcpa at mandriva.com.br
Mon Feb 9 09:16:01 PST 2009
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.
Remove AC_SUBST(DRIVER_NAME), that was used only in man/Makefile.am.
Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
.gitignore | 3 ++
ChangeLog | 66 -------------------------------------------------------
Makefile.am | 9 +++++++
configure.ac | 36 +++++++----------------------
man/Makefile.am | 4 +-
src/Makefile.am | 2 +-
6 files changed, 24 insertions(+), 96 deletions(-)
delete mode 100644 ChangeLog
diff --git a/.gitignore b/.gitignore
index fa52c64..feae9a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@ libtool
ltmain.sh
missing
stamp-h1
+xf86-video-fbdev-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ead4bce..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2006-05-19 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- * src/fbdev.c:
- Bump to 0.3.0
-
-2006-05-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * src/fbdev.c: (FBDevShadowInit), (FBDevScreenInit),
- (FBDevCloseScreen):
- Fix ShadowFB support to work with recent miext/shadow changes from
- bug #5460 (Kevin Martin), and apply fix for miext/shadow crasher
- https://bugs.freedesktop.org/show_bug.cgi?id=6940 (Kristian
- Hoegsberg).
-
-2006-04-06 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- * src/fbdev.c:
- Unlibcwrap. Bump server version requirement. Bump to 0.2.0.
-
-2006-01-09 David Nusinow <gravity-at-freedesktop-dot-org>
-
- * man/fbdev.man:
- Convert manpage to utf-8
- Bugzilla #1925 <https://bugs.freedesktop.org/show_bug.cgi?id=1925>
-
-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 7052905..6a0325e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+EXTRA_DIST = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 7e82996..cc4203b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,9 @@ AC_INIT([xf86-video-fbdev],
xf86-video-fbdev)
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,17 +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"])
-AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
- [Enable use of libpciaccess (default: disabled)]),
- [PCIACCESS=$enableval], [PCIACCESS=no])
+moduledir="$libdir/xorg/modules"
+sdkdir="$includedir/xorg"
+AC_SUBST(moduledir)
+AC_SUBST(sdkdir)
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -57,7 +56,6 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
# 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)
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
@@ -67,26 +65,10 @@ AC_CHECK_DECL(xf86ConfigIsaEntity,
[#include "xf86.h"])
CFLAGS="$save_CFLAGS"
-AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes])
-if test "x$PCIACCESS" = xyes; then
- AC_DEFINE(PCIACCESS, 1, [Use libpciaccess])
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
-fi
-
-# Checks for libraries.
-
-# Checks for header files.
AC_HEADER_STDC
-
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([moduledir])
-
-DRIVER_NAME=fbdev
-AC_SUBST([DRIVER_NAME])
-
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([
Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..b9cbd0e 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,11 +27,11 @@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME at .man
+driverman_PRE = fbdev.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME at .man
+EXTRA_DIST = fbdev.man
CLEANFILES = $(driverman_DATA)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1203177..963670a 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 = $(CWARFLAGS) $(XORG_CFLAGS)
fbdev_drv_la_LTLIBRARIES = fbdev_drv.la
fbdev_drv_la_LDFLAGS = -module -avoid-version
fbdev_drv_ladir = @moduledir@/drivers
--
1.6.1
------=_20090209154659_81820--
More information about the xorg-devel
mailing list