diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 18:40:18 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 18:40:18 -0200 |
| commit | 8f1476657baae54dcca998c01bd4ffe0233a6ba2 (patch) | |
| tree | 75967bf455d06752eb7f047d547db4f0e7dad331 | |
| parent | 8906fd92f85710d6d7eceac2fb5955e8c56eadcd (diff) | |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | viewres.c | 8 |
4 files changed, 24 insertions, 6 deletions
@@ -19,3 +19,7 @@ stamp-h1 viewres viewres.1 *~ +*.o +viewres-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index d83a5ca..a13ad72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,7 @@ appman_PRE = \ viewres.man # App default files +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults appdefaultdir = @appdefaultdir@ @@ -75,6 +76,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 3593007..840a4a6 100644 --- a/configure.ac +++ b/configure.ac @@ -26,21 +26,32 @@ AC_INIT(viewres,[1.0.1], [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) AC_PROG_CC AC_PROG_INSTALL -PKG_CHECK_MODULES(VIEWRES, xaw7) +XORG_CWARNFLAGS +PKG_CHECK_MODULES(VIEWRES, xaw7) +VIEWRES_CFLAGS="$CWARNFLAGS $VIEWRES_CFLAGS" AC_SUBST(VIEWRES_CFLAGS) AC_SUBST(VIEWRES_LIBS) PKG_CHECK_MODULES(APPDEFS, xt) -appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_ARG_WITH(appdefaultdir, + AC_HELP_STRING([--with-appdefaultdir=<pathname>], + [specify directory for app-defaults files (default is autodetected)]), + [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) @@ -75,11 +75,13 @@ typedef struct { XtIsManaged(VData(node)->resource_lw)) -struct { +struct WidgetList { int n_elements; int max_elements; XmuWidgetNode **elements; -} selected_list = { 0, 0, (XmuWidgetNode **) NULL }; +}; + +static struct WidgetList selected_list = { 0, 0, (XmuWidgetNode **) NULL }; #define INSERT_NODE(node,i) \ selected_list.elements[VData(node)->selection_index = (i)] = (node) @@ -88,7 +90,7 @@ struct { selected_list.elements[VData(node)->selection_index] = \ (XmuWidgetNode *) NULL; VData(node)->selection_index = (-1) -const char *ProgramName; +static const char *ProgramName; static int NumberShowing = 0; static Arg sensitiveargs[2] = {{ XtNsensitive, (XtArgVal) FALSE }, |