diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | xdriinfo.c | 4 |
4 files changed, 15 insertions, 3 deletions
@@ -18,3 +18,7 @@ stamp-h1 xdriinfo xdriinfo.1 *~ +*.o +xdriinfo-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index c323b9e..0fee910 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,7 @@ MAINTAINERCLEANFILES=ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 6e92ccb..5b64c31 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,10 @@ AC_INIT(xdriinfo, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=x AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# 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_PROG_CC @@ -32,8 +36,11 @@ AC_PROG_INSTALL AC_TYPE_SIGNAL +XORG_CWARNFLAGS + # Checks for pkg-config packages PKG_CHECK_MODULES(XDRIINFO, x11 glproto) +XDRIINFO_CFLAGS="$CWARNFLAGS $XDRIINFO_CFLAGS" AC_SUBST(XDRIINFO_CFLAGS) AC_SUBST(XDRIINFO_LIBS) @@ -45,5 +52,6 @@ AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [], XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) @@ -33,8 +33,8 @@ typedef const char * glXGetScreenDriver_t (Display *dpy, int scrNum); typedef const char * glXGetDriverConfig_t (const char *driverName); -glXGetScreenDriver_t *GetScreenDriver; -glXGetDriverConfig_t *GetDriverConfig; +static glXGetScreenDriver_t *GetScreenDriver; +static glXGetDriverConfig_t *GetDriverConfig; enum INFO_FUNC { LIST, NSCREENS, DRIVER, OPTIONS |