diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 15:08:23 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 15:08:23 -0200 |
| commit | 11fbe620625520668f5e88e4f5a8fe149a7cfa3f (patch) | |
| tree | f25f5633933401f2aa60a89b9880643bbcce667d | |
| parent | 7f6275300243fd15ce974d1b5e478b47f7758485 (diff) | |
Janitor: Correct make distcheck and remove extra .gitignore file.
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | include/.gitignore | 1 |
4 files changed, 12 insertions, 12 deletions
@@ -30,4 +30,9 @@ missing mkinstalldirs stamp-h1 xau.pc +Xau.3 *~ +*.o +libXau-*tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 635fdb9..f877dbc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,6 +87,6 @@ Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man .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 9e1b2a5..43c7992 100644 --- a/configure.ac +++ b/configure.ac @@ -30,9 +30,9 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AC_PROG_CC AC_PROG_INSTALL @@ -40,8 +40,10 @@ AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL AC_PROG_MAKE_SET +XORG_CWARNFLAGS PKG_CHECK_MODULES(XAU, xproto) +XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS" AC_SUBST(XAU_CFLAGS) AC_SUBST(XAU_LIBS) @@ -77,15 +79,9 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([Xau]) LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}" -if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" - XAU_CFLAGS="$GCC_WARNINGS $XAU_CFLAGS" -fi - XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile xau.pc]) diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index 08d2b99..0000000 --- a/include/.gitignore +++ /dev/null @@ -1 +0,0 @@ -X11 |