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

Thu Feb 5 09:55:40 PST 2009

Use `` instead of $().
  Use $PKG_CONFIG to honor user build setup.
  Replace ChangeLog with automatically generated version, this is
also one of the "make distcheck" corrections.
  Use XORG_CWARNFLAGS macro.
  Update .gitignore for files left after make distcheck.

  This uses the same solution suggested for evdev and joystick to
correct the issue with pkg-config variables that specify a directory,
but break "make distcheck".

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 .gitignore        |    4 ++++
 ChangeLog         |   21 ---------------------
 Makefile.am       |   10 ++++++++++
 configure.ac      |   20 +++++++++++++-------
 src/Makefile.am   |    2 ++
 tools/Makefile.am |    1 +
 6 files changed, 30 insertions(+), 28 deletions(-)
 delete mode 100644 ChangeLog

diff --git a/.gitignore b/.gitignore
index 1aaf548..ad70b8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@ synclient
 syndaemon
 *.[0-9]
 *.pc
+*~
+xf86-input-synaptics-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 9e39ed4..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2008-07-08  Christoph Brill <egore911 at egore911.de>
-
-	* ChangeLog: testing the official hosting at freedesktop.org
-
-2008-06-06  Christoph Brill <egore911 at egore911.de>
-
-	* src/freebsd_mouse.h, src/linux_input.h: drop and use installed
-	system headers
-	* src/alpscomm.c, src/eventcomm.c, src/ps2comm.c, src/psmcomm.c,
-	src/psmcomm.h, src/synaptics.c, src/synclient.c, src/syndaemon.c: Add
-	config.h
-	* src/eventcomm.c, src/eventcomm.h: Only build on Linux
-	* src/psmcomm.c, src/psmcomm.h: Only build on *BSD
-	* src/synaptics.c, src/synclient.c: Make it build on the new build
-	system
-	* src/synaptics.c: Fix build against latest git by replacing all the
-	xf86_ansi.h functions by the native ones
-
-2008-06-06  Christoph Brill <egore911 at egore911.de>
-
-	* src/*.c, src/*.h: move files to a directory
diff --git a/Makefile.am b/Makefile.am
index ad69d2a..bb749de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,18 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AUTOMAKE_OPTIONS = foreign
+DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg
 SUBDIRS = include src man tools fdi
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-synaptics.pc
 
+EXTRA_DIST = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index d2aea91..532fc84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-DRIVER_NAME=synaptics
-AC_SUBST([DRIVER_NAME])
-
+# 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])
 
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
+XORG_CWARNFLAGS
 
 AH_TOP([#include "xorg-server.h"])
 
@@ -103,12 +104,13 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+xorg_sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
+AC_ARG_WITH(sdkdir,
+	AC_HELP_STRING([--with-sdkdir=<path>],
+		[Xorg X Server sdk headers (default is autodetected)]),
+	[sdkdir="$withval"], [sdkdir="${xorg_sdkdir}"])
 AC_SUBST([sdkdir])
 
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-
 # Checks for libraries.
 PKG_CHECK_MODULES(XLIB, x11) # needed for syndaemon
 PKG_CHECK_MODULES(XRECORD, xtst, AC_DEFINE([HAVE_XRECORD],[],[Use XRecord]), true)
@@ -116,8 +118,12 @@ PKG_CHECK_MODULES(XRECORD, xtst, AC_DEFINE([HAVE_XRECORD],[],[Use XRecord]), tru
 # Checks for header files.
 AC_HEADER_STDC
 
+DRIVER_NAME=synaptics
+AC_SUBST([DRIVER_NAME])
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index fc7d20a..d7eb08d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,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 = $(CWARNFLAGS) $(XORG_CFLAGS)
+
 @DRIVER_NAME at _drv_la_LTLIBRARIES = @DRIVER_NAME at _drv.la
 @DRIVER_NAME at _drv_la_LDFLAGS = -module -avoid-version
 @DRIVER_NAME at _drv_ladir = @inputdir@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2f2199b..46c46ea 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,6 +17,7 @@
 #  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
 
 bin_PROGRAMS = \
 	synclient \
-- 
1.6.1

------=_20090205164802_99429--

