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

Paulo Cesar Pereira de Andrade pcpa at mandriva.com.br
Thu Feb 5 11:51:47 PST 2009 

  Use `` instead of $().
  Use $PKG_CONFIG to honor user build setup.
  Replace ChangeLog with automatically generated version, this is
also the "make distcheck" correction.
  Minor cleanup to prefer using $(VAR) instead of @VAR@, also
simplifying configure.ac by removing the AC_SUBST(VAR).

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 .gitignore      |    6 +++++
 ChangeLog       |   67 -------------------------------------------------------
 Makefile.am     |   10 +++++++-
 configure.ac    |   14 +++++------
 src/Makefile.am |    3 ++
 5 files changed, 24 insertions(+), 76 deletions(-)
 delete mode 100644 ChangeLog

diff --git a/.gitignore b/.gitignore
index 2df4a8d..0c05190 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-apm-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 482b388..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,67 +0,0 @@
-2006-04-07  Adam Jackson  <ajax at freedesktop.org>
-
-	* configure.ac:
-	* src/apm_driver.c:
-	Bump to 1.1.1 for Xv changes.
-
-2006-04-07  Aaron Plattner  <aplattner at nvidia.com>
-
-	* src/apm_video.c: (ReputImage), (PutImage):
-	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/apm.h:
-	* src/apm_dga.c:
-	* src/apm_driver.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
-
-	* src/apm_driver.c:
-	Fix a missed VERSION -> APM_VERSION.
-
-2005-12-26  Adam Jackson  <ajax at freedesktop.org>
-
-	* src/apm_driver.c:
-	Bug #5356: Don't redefine VERSION.  (Tilman Sauerbeck)
-
-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 98bb94a..f2c44ea 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 b15f61e..9ca8be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,9 @@ AC_INIT([xf86-video-apm],
         xf86-video-apm)
 
 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"])
 
@@ -55,17 +59,10 @@ 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`
 
 PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no)
 AM_CONDITIONAL(XF86RUSH, test "x$have_xf86rush" = xyes)
-AC_SUBST([XF86RUSH_LIBS])
-AC_SUBST([XF86RUSH_CFLAGS])
-
-CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
-AC_SUBST([CFLAGS])
-AC_SUBST([INCLUDES])
 
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS"
@@ -98,6 +95,7 @@ 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 8a6779e..6fe12a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,8 +24,11 @@
 # -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 = $(CWARNFLAGS) $(XORG_CFLAGS) $(XF86RUSH_CFLAGS)
+
 apm_drv_la_LTLIBRARIES = apm_drv.la
 apm_drv_la_LDFLAGS = -module -avoid-version
+apm_drv_la_LIBADD = $(XF86RUSH_LIBS)
 apm_drv_ladir = @moduledir@/drivers
 
 apm_drv_la_SOURCES = \
-- 
1.6.1

------=_20090205182626_50483--

More information about the xorg mailing list