diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 19:56:47 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 19:56:47 -0200 |
| commit | bf4f73771315fbb963739ee8df8e6aea5a3ed74f (patch) | |
| tree | 67707ee8f954873d39350400beec0541a33fefc9 | |
| parent | fd27a5bc96f22450d127536e1370a7cdcce8f523 (diff) | |
Janitor: make distcheck, .gitignore.
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/.gitignore | 6 |
4 files changed, 16 insertions, 12 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -20,3 +22,9 @@ mkinstalldirs stamp-h1 xkbui.pc *~ +*.o +*.la +*.lo +libxkbui-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 827da16..f910142 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,15 +24,12 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xkbui.pc -EXTRA_DIST = xkbui.pc.in autogen.sh - - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xkbui.pc.in ChangeLog 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 279f320..bff4e2f 100644 --- a/configure.ac +++ b/configure.ac @@ -27,20 +27,25 @@ AC_INIT(libxkbui, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xor 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) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Check for dependencies PKG_CHECK_MODULES(XKBUI, x11 xkbfile) AC_SEARCH_LIBS(hypot, [m]) - +XKBUI_CFLAGS="$CWARNFLAGS $XKBUI_CFLAGS" AC_SUBST(XKBUI_CFLAGS) AC_SUBST(XKBUI_LIBS) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 43afd37..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libxkbui.la -*.lo -Makefile -Makefile.in |