diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:56:38 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:56:38 -0200 |
| commit | 13ee4d00a06421dfb5ee613cbd99a3111135c379 (patch) | |
| tree | 1f643f1c80a2916e1fe31772c712aef05cb31f92 | |
| parent | 168153d1e7d196ca46c5b2e286fcf7e7793f2804 (diff) | |
Janitor: Correct make distcheck and remove extra .gitignore files.
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 25 | ||||
| -rw-r--r-- | man/.gitignore | 3 | ||||
| -rw-r--r-- | src/.gitignore | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
6 files changed, 23 insertions, 33 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -20,3 +22,10 @@ mkinstalldirs stamp-h1 xres.pc *~ +*.3 +*.o +*.la +*.lo +libXres-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 4f08347..6a30fce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,18 +23,15 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -AM_CFLAGS = $(RESOURCEEXT_CFLAGS) $(XRES_CFLAGS) - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xres.pc -EXTRA_DIST = xres.pc.in autogen.sh ChangeLog - -CLEANFILES = ChangeLog +EXTRA_DIST = xres.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 97397bc..ce4ab28 100644 --- a/configure.ac +++ b/configure.ac @@ -33,37 +33,30 @@ dnl AC_INIT(libXres, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) +# 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 # get modules -PKG_CHECK_MODULES(XRES, x11 xext xextproto) - -AC_SUBST(XRES_CFLAGS) -AC_SUBST(XRES_LIBS) # Check xres configuration, strip extra digits from package version to # find the required protocol version - RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(RESOURCEEXT, resourceproto >= $RES_VERSION) - -AC_SUBST(RESOURCEEXT_CFLAGS) -AC_SUBST(RESOURCEEXT_LIBS) - -if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" - CFLAGS="$GCC_WARNINGS $CFLAGS" -fi +PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION]) +XRES_CFLAGS="$CWARNFLAGS $XRES_CFLAGS" +AC_SUBST(XRES_CFLAGS) +AC_SUBST(XRES_LIBS) XORG_CHECK_MALLOC_ZERO XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 2d0f344..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.3* diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index a2564a4..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libXRes.la -*.lo -Makefile -Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index 085d520..16a7c04 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,9 +3,9 @@ lib_LTLIBRARIES = libXRes.la libXRes_la_SOURCES = \ XRes.c -libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@ +libXRes_la_LIBADD = @XRES_LIBS@ -AM_CFLAGS = @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@ +AM_CFLAGS = @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@ INCLUDES = -I$(top_srcdir)/include |