diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-21 19:22:31 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-21 19:22:31 -0200 |
| commit | c30b10caedf7bdafb9abda914f80c90bfaccaec5 (patch) | |
| tree | 7b309dd856425f161f987ad0aa2139f9a7e84879 | |
| parent | 57f917f8934d441ebb6501c4691a2b59fa217f3f (diff) | |
Correct make distcheck for recent git versions.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 13 insertions, 2 deletions
@@ -23,3 +23,6 @@ xinitrc *~ *.o org.x.X11.plist +xinit-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 0d831f3..951d51a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ XINITDIR = $(libdir)/X11/xinit bin_PROGRAMS = xinit bin_SCRIPTS = startx -xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\" +AM_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\" xinit_LDADD = $(XINIT_LIBS) xinit_SOURCES = \ @@ -77,6 +77,6 @@ EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp $(appman_PRE) \ .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 78b8827..7e2fb82 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,10 @@ AC_INIT(xinit,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] 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 @@ -41,6 +45,8 @@ AC_CHECK_FUNCS([killpg]) m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) +XORG_CWARNFLAGS + # Build options DEFAULT_XRDB=xrdb DEFAULT_XMODMAP=xmodmap @@ -131,6 +137,7 @@ case $host_os in ;; esac +XINIT_CFLAGS="$CWARNFLAGS $XINIT_CFLAGS" AC_SUBST(XINIT_CFLAGS) AC_SUBST(XINIT_LIBS) @@ -184,6 +191,7 @@ AC_DEFINE(XORG, 1, [Define if you have Xorg X server]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) AC_OUTPUT([privileged_startx/Makefile]) |