[PATCH 1/2] Janitor: make distcheck, .gitignore.

Paulo Cesar Pereira de Andrade pcpa at mandriva.com.br
Fri Feb 6 11:13:57 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.
  Use a single .gitignore file.

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 .gitignore       |   11 +++++++
 ChangeLog        |   84 ------------------------------------------------------
 Makefile.am      |   10 ++++++-
 configure.ac     |   11 ++++--
 man/.gitignore   |    2 -
 src/.gitignore   |    6 ----
 src/Makefile.am  |    7 ++--
 util/.gitignore  |    8 -----
 util/Makefile.am |    2 +
 9 files changed, 33 insertions(+), 108 deletions(-)
 delete mode 100644 ChangeLog
 delete mode 100644 man/.gitignore
 delete mode 100644 src/.gitignore
 delete mode 100644 util/.gitignore

diff --git a/.gitignore b/.gitignore
index 5d02f1c..2f35d5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 Makefile
 Makefile.in
 *.la
@@ -19,3 +21,12 @@ ltmain.sh
 missing
 stamp-h1
 *~
+*.4
+*.o
+dRegs
+mRegs
+memClock
+modClock
+xf86-video-chips-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 42d5dc1..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,84 +0,0 @@
-2006-04-07  Adam Jackson  <ajax at freedesktop.org>
-
-	* configure.ac:
-	* src/ct_driver.c:
-	Bump to 1.1.1 for Xv changes.
-
-2006-04-07  Aaron Plattner  <aplattner at nvidia.com>
-
-	* src/ct_video.c: (CHIPSPutImage):
-	Add a DrawablePtr argument to the XV functions to pave the way for
-	redirected video.
-
-2006-04-06  Adam Jackson  <ajax at freedesktop.org>
-
-	* configure.ac:
-	* src/ct_accel.c:
-	* src/ct_bank.c:
-	* src/ct_cursor.c:
-	* src/ct_ddc.c:
-	* src/ct_dga.c:
-	* src/ct_driver.c:
-	* src/ct_driver.h:
-	* src/ct_regs.c:
-	* src/ct_shadow.c:
-	* src/ct_video.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
-
-	* src/ct_driver.c:
-	VERSION -> CHIPS_VERSION
-
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version for X11R7 release.
-
-2005-12-19  Alan Coopersmith  <alan.coopersmith at sun.com>
-
-	* README.sgml:
-	Fix typo.
-
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
-
-2005-12-08  Adam Jackson  <ajax at freedesktop.org>
-
-	* src/Makefile.am:
-	Re-fix for #4588, this one actually works.
-
-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 depedencies to work with separate build roots.
-
-2005-10-04  Adam Jackson  <ajax at freedesktop.org>
-
-	* src/Makefile.am:
-	Bug #4588: N-way build of ct_accel.c, as in monolith.
diff --git a/Makefile.am b/Makefile.am
index 9724e03..e879e29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,4 +27,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 b4120a3..65d05c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,9 @@ AC_INIT([xf86-video-chips],
         xf86-video-chips)
 
 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"
@@ -97,14 +102,12 @@ int main() {
 AC_MSG_RESULT([$HAVE_INB])
 AM_CONDITIONAL(BUILD_UTILS, [test x$HAVE_INB = xyes])
 
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([moduledir])
-
 DRIVER_NAME=chips
 AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 XORG_CHECK_LINUXDOC
 
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
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 0ebf7ea..4d2f8da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,20 +19,21 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # sick hack borrowed from mga.  please, people, don't write code this ugly.
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
+
 noinst_LTLIBRARIES = libct_accelmm.la libct_accelhi.la
 
 libct_accelmm_la_SOURCES = ct_accel.c
-libct_accelmm_la_CFLAGS = @XORG_CFLAGS@ -DCHIPS_MMIO
+libct_accelmm_la_CFLAGS = $(AM_CFLAGS) -DCHIPS_MMIO
 
 libct_accelhi_la_SOURCES = ct_accel.c
-libct_accelhi_la_CFLAGS = @XORG_CFLAGS@ -DCHIPS_MMIO -DCHIPS_HIQV
+libct_accelhi_la_CFLAGS = $(AM_CFLAGS) -DCHIPS_MMIO -DCHIPS_HIQV
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -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@
 chips_drv_la_LTLIBRARIES = chips_drv.la
 chips_drv_la_LDFLAGS = -module -avoid-version
 chips_drv_ladir = @moduledir@/drivers
diff --git a/util/.gitignore b/util/.gitignore
deleted file mode 100644
index 04d4c43..0000000
--- a/util/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-dRegs
-mRegs
-memClock
-modClock
diff --git a/util/Makefile.am b/util/Makefile.am
index c822625..9c5b3ad 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,4 +1,6 @@
 # these are not even built in the monolith, so don't install them
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
+
 if BUILD_UTILS
 noinst_PROGRAMS = dRegs mRegs modClock memClock
 endif
-- 
1.6.1

------=_20090206181537_52505--

More information about the xorg-devel mailing list