diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-28 19:00:27 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-28 19:00:27 -0200 |
| commit | 94de42346e098f3893c11da769050ab7ed5d0798 (patch) | |
| tree | 19dc4f01eadee1c9df1c1250f9bc9beca8af56a4 | |
| parent | 77a3ccd6b05029223630cd9fb9b0c97b1196db89 (diff) | |
Janitor: ansification, make distcheck, compiler warnings.
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rwxr-xr-x | src/windowswm.c | 4 |
5 files changed, 19 insertions, 9 deletions
@@ -1,3 +1,5 @@ +.deps +.libs Makefile Makefile.in aclocal.m4 @@ -18,3 +20,9 @@ missing stamp-h1 windowswm.pc *~ +*.o +*.la +*.lo +libWindowsWM-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index cd910c9..573f167 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,15 +24,12 @@ SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = windowswm.pc -EXTRA_DIST = windowswm.pc.in autogen.sh - - -EXTRA_DIST += ChangeLog +EXTRA_DIST = windowswm.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 d0f1f95..b2c3ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -27,20 +27,25 @@ AC_INIT(libWindowsWM, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product 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(WINDOWSWM, x11 xext xextproto windowswmproto) - +WINDOWSWM_CFLAGS="$CWARNFLAGS $WINDOWSWM_CFLAGS" AC_SUBST(WINDOWSWM_CFLAGS) AC_SUBST(WINDOWSWM_LIBS) XORG_CHECK_MALLOC_ZERO XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index f52da02..f12529a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libWindowsWM.la libWindowsWM_la_SOURCES = \ windowswm.c -libWindowsWM_la_CFLAGS = @WINDOWSWM_CFLAGS@ @MALLOC_ZERO_CFLAGS@ +AM_CFLAGS = @WINDOWSWM_CFLAGS@ @MALLOC_ZERO_CFLAGS@ libWindowsWM_la_LIBADD = @WINDOWSWM_LIBS@ libWindowsWM_la_LDFLAGS = -version-info 7:0:0 -no-undefined diff --git a/src/windowswm.c b/src/windowswm.c index 5d2a285..250a63f 100755 --- a/src/windowswm.c +++ b/src/windowswm.c @@ -56,8 +56,8 @@ static char *windowswm_extension_name = WINDOWSWMNAME; *****************************************************************************/ static int close_display (Display *dpy, XExtCodes *extCodes); -static Bool wire_to_event (); -static Status event_to_wire (); +static Bool wire_to_event (Display *dpy, XEvent *re, xEvent *event); +static Status event_to_wire (Display *dpy, XEvent *re, xEvent *event); static /* const */ XExtensionHooks windowswm_extension_hooks = { NULL, /* create_gc */ |