diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:08 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:08 -0200 |
| commit | 0678b945e4f382c45048e3d1a9739282d506b47e (patch) | |
| tree | 6c36f94ac87fee0f893cf12d5007da7999445597 | |
| parent | de26fc14c3e5ecc24f4fbdf0c83d57f5974ed802 (diff) | |
Janitor: Correct make distcheck and configure.ac simplification
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | ucs2any.c | 5 |
4 files changed, 19 insertions, 11 deletions
@@ -20,3 +20,7 @@ stamp-h1 ucs2any ucs2any.1 *~ +*.o +font-util-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 69df22f..fe23e34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,8 @@ bin_PROGRAMS = bdftruncate ucs2any +AM_CFLAGS = $(CWARNFLAGS) + ucs2any_SOURCES = ucs2any.c bdftruncate_SOURCES = bdftruncate.c @@ -58,7 +60,6 @@ CLEANFILES = bdftruncate $(appman_DATA) EXTRA_DIST = $(mapfiles_DATA) \ $(appman_PRE) \ - autogen.sh \ fontutil.pc.in \ $(aclocal_DATA) @@ -83,6 +84,6 @@ 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 e582c89..bae5c27 100644 --- a/configure.ac +++ b/configure.ac @@ -26,21 +26,23 @@ AC_INIT(font-util, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product= AM_INIT_AUTOMAKE([foreign 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) +XORG_CWARNFLAGS AC_PROG_CC AC_PROG_INSTALL -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_MAPDIR=${libdir}/X11/fonts/util -AC_ARG_WITH(mapdir, - AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]), - [MAPDIR="$withval"], - [MAPDIR="$DEFAULT_MAPDIR"]) +mapdir=${libdir}/X11/fonts/util +AC_ARG_WITH(mapdir, AC_HELP_STRING([--with-mapdir=<pathname>], + [Path to install font maps]), [mapdir="$withval"]) +MAPDIR="$mapdir" AC_SUBST(MAPDIR) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile fontutil.pc]) @@ -52,7 +52,7 @@ #include <unistd.h> /* global variable for argv[0] */ -const char *my_name = NULL; +static const char *my_name = NULL; #ifdef NEED_BASENAME static char * @@ -333,7 +333,7 @@ DEC VT100 graphics characters in the range 1-31 (as expected by some old xterm versions and a few other applications) */ #define decmap_size 31 -int decmap[decmap_size] = { +static int decmap[decmap_size] = { 0x25C6, /* BLACK DIAMOND */ 0x2592, /* MEDIUM SHADE */ 0x2409, /* SYMBOL FOR HORIZONTAL TABULATION */ @@ -519,6 +519,7 @@ main(int argc, char *argv[]) char *registry_encoding = NULL; my_name = argv[0]; + bbx.cheight = bbx.cxoff = bbx.cyoff = -1; startchar = da_new("startchar"); my_char = da_new("my_char"); |