.gitignore | 13 ++++++++++++ ChangeLog | 59 -------------------------------------------------------- Makefile.am | 10 ++++++++- README | 25 +++++++++++++++++++++++ configure.ac | 11 +++++++--- man/.gitignore | 3 -- man/Makefile.am | 16 +++++---------- src/.gitignore | 9 -------- src/Makefile.am | 2 - src/XF86Misc.c | 42 ++++++++++----------------------------- 10 files changed, 73 insertions(+), 117 deletions(-)
New commits: commit 74b475b59fd0da95f91e75d5f32276e87dda6f3f Author: Alan Coopersmith <[email protected]> Date: Thu Oct 8 22:21:41 2009 -0700 libXxf86misc 1.0.2 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 82d4c0d..f9171be 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc) +AC_INIT(libXxf86misc, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 6f5d7342b4192db164913106b5630ebb91d067ca Author: Alan Coopersmith <[email protected]> Date: Thu Oct 8 22:21:03 2009 -0700 Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 2ad247e..82d4c0d 100644 --- a/configure.ac +++ b/configure.ac @@ -4,23 +4,23 @@ AC_INIT(libXxf86misc, 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) +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) + AM_CONFIG_HEADER(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto) XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/man/Makefile.am b/man/Makefile.am index 4e1b1a4..40a9794 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -30,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libman_PRE = XF86Misc.man -BUILT_SOURCES = shadows.DONE - EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \ - $(XF86Misc_shadows:=...@lib_man_suffix@) + $(XF86Misc_shadowmen) SED = sed @@ -55,7 +53,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(LIB_MAN_SUFFIX) .man .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) @@ -69,8 +67,7 @@ XF86Misc_shadows = \ XF86MiscGetKbdSettings \ XF86MiscSetKbdSettings -shadows.DONE: - -rm -f $(XF86Misc_shadows:=...@lib_man_suffix@) - (for i in $(XF86Misc_shadows:=...@lib_man_suffix@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \ - done) +XF86Misc_shadowmen = $(XF86Misc_shadows:=...@lib_man_suffix@) + +$(XF86Misc_shadowmen): + $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 715b82d..4f5b3f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la libXxf86misc_la_SOURCES = XF86Misc.c -AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS) libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS) libXxf86misc_la_LDFLAGS = -version-number 1:1:0 commit 3337b434ffc664d02e763dfba7e56f5942ad9544 Author: Alan Coopersmith <[email protected]> Date: Mon Feb 2 20:34:37 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/README b/README new file mode 100644 index 0000000..e5a7b3d --- /dev/null +++ b/README @@ -0,0 +1,25 @@ +libXxf86misc - Extension library for the XFree86-Misc X extension. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/lib/libXxf86misc + + http://cgit.freedesktop.org/xorg/lib/libXxf86misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + commit 860ee8b84e4df995ba241d16d9adbf5b7c77e5ae Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Mon Feb 2 14:30:51 2009 -0200 Janitor: ansification, make distcheck, compiler warnings, .gitignore. diff --git a/.gitignore b/.gitignore index 64b9b9b..ad3d7ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,11 @@ +.deps +.libs aclocal.m4 autom4te.cache compile config.guess +config.h +config.h.in config.log config.status config.sub @@ -14,5 +18,13 @@ Makefile Makefile.in missing mkinstalldirs +stamp-h1 xxf86misc.pc *~ +*.3 +*.o +*.la +*.lo +libXxf86misc-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index d80a181..1b735d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,14 +3,12 @@ SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xxf86misc.pc -EXTRA_DIST = xxf86misc.pc.in autogen.sh - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xxf86misc.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 c821849..2ad247e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,11 +4,15 @@ AC_INIT(libXxf86misc, 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(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto) @@ -16,6 +20,7 @@ PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto) 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 07e6fa2..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -config.h -config.h.in -.deps -.libs -libXxf86misc.la -*.lo -Makefile -Makefile.in -stamp-h1 diff --git a/src/XF86Misc.c b/src/XF86Misc.c index b0669d5..193224f 100644 --- a/src/XF86Misc.c +++ b/src/XF86Misc.c @@ -56,9 +56,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86misc_info) * * *****************************************************************************/ -Bool XF86MiscQueryExtension (dpy, event_basep, error_basep) - Display *dpy; - int *event_basep, *error_basep; +Bool XF86MiscQueryExtension (Display *dpy, int *event_basep, int *error_basep) { XExtDisplayInfo *info = find_display (dpy); @@ -71,10 +69,7 @@ Bool XF86MiscQueryExtension (dpy, event_basep, error_basep) } } -Bool XF86MiscQueryVersion(dpy, majorVersion, minorVersion) - Display* dpy; - int* majorVersion; - int* minorVersion; +Bool XF86MiscQueryVersion(Display* dpy, int* majorVersion, int* minorVersion) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscQueryVersionReply rep; @@ -119,9 +114,7 @@ XF86MiscSetClientVersion(Display *dpy) return True; } -Bool XF86MiscGetMouseSettings(dpy, mouseinfo) - Display* dpy; - XF86MiscMouseSettings *mouseinfo; +Bool XF86MiscGetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscGetMouseSettingsReply rep; @@ -165,9 +158,7 @@ Bool XF86MiscGetMouseSettings(dpy, mouseinfo) return True; } -Bool XF86MiscGetKbdSettings(dpy, kbdinfo) - Display* dpy; - XF86MiscKbdSettings *kbdinfo; +Bool XF86MiscGetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscGetKbdSettingsReply rep; @@ -195,9 +186,7 @@ Bool XF86MiscGetKbdSettings(dpy, kbdinfo) return True; } -Bool XF86MiscSetMouseSettings(dpy, mouseinfo) - Display* dpy; - XF86MiscMouseSettings *mouseinfo; +Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscSetMouseSettingsReq *req; @@ -235,9 +224,7 @@ Bool XF86MiscSetMouseSettings(dpy, mouseinfo) return True; } -Bool XF86MiscSetKbdSettings(dpy, kbdinfo) - Display* dpy; - XF86MiscKbdSettings *kbdinfo; +Bool XF86MiscSetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscSetKbdSettingsReq *req; @@ -258,9 +245,7 @@ Bool XF86MiscSetKbdSettings(dpy, kbdinfo) return True; } -int XF86MiscSetGrabKeysState(dpy, enable) - Display* dpy; - Bool enable; +int XF86MiscSetGrabKeysState(Display* dpy, Bool enable) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscSetGrabKeysStateReply rep; @@ -284,9 +269,7 @@ int XF86MiscSetGrabKeysState(dpy, enable) return rep.status; } -Bool XF86MiscGetFilePaths(dpy, filpaths) - Display* dpy; - XF86MiscFilePaths *filpaths; +Bool XF86MiscGetFilePaths(Display* dpy, XF86MiscFilePaths *filpaths) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscGetFilePathsReply rep; @@ -354,12 +337,9 @@ Bool XF86MiscGetFilePaths(dpy, filpaths) return True; } -Status XF86MiscPassMessage(dpy, screen, msgtype, msgval, retmsg) - Display* dpy; - int screen; - const char* msgtype; - const char* msgval; - char** retmsg; +Status XF86MiscPassMessage(Display* dpy, int screen, + const char* msgtype, const char* msgval, + char** retmsg) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscPassMessageReply rep; commit 6bc07578f11eecb1c67a6dd28861a0cbc03621c6 Author: Matthieu Herrb <[email protected]> Date: Sun Mar 9 08:49:52 2008 +0100 nuke RCS Ids diff --git a/man/Makefile.am b/man/Makefile.am index 262fb31..4e1b1a4 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,4 +1,3 @@ -# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # commit b3b1c2f578fd68b3cea689876acf68807e2cb03a Author: James Cloos <[email protected]> Date: Thu Dec 6 16:38:46 2007 -0500 Replace static ChangeLog with dist-hook to generate from git log diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index a866050..0000000 --- a/ChangeLog +++ /dev/null @@ -1,59 +0,0 @@ -2006-04-26 Adam Jackson <[email protected]> - - * configure.ac: - Bump to 1.0.1 - -2006-02-12 Alan Coopersmith <[email protected]> - - * man/Makefile.am: - Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628> - Shadow pages not created correctly when MANDIR & MANSUFFIX don't match. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - * src/Makefile.am: - Add check and cflags for malloc(0) returning NULL. - -2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * xxf86misc.pc.in: - Update pkgconfig files to separate library build-time dependencies - from application build-time dependencies. - -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for RC1 release. - -2005-10-11 Alan Coopersmith <[email protected]> - - * configure.ac: - * man/Makefile.am: - Use sed to put version number in man page - Add shadow man pages for man pages that document multiple functions. - -2005-07-08 Keith Packard <[email protected]> - - * .cvsignore: - * man/.cvsignore: - * src/.cvsignore: - * src/Makefile.am: - Add .cvsignore files - Switch _la_CFLAGS for AM_CFLAGS to clean up directory - diff --git a/Makefile.am b/Makefile.am index cdfbd95..d80a181 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,3 +4,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xxf86misc.pc EXTRA_DIST = xxf86misc.pc.in autogen.sh + +EXTRA_DIST += 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) + +dist-hook: ChangeLog commit f4ed7977e3bd5a60df0d5df089a613462c04dc3f Author: James Cloos <[email protected]> Date: Mon Sep 3 05:53:51 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings diff --git a/.gitignore b/.gitignore index b40641f..64b9b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ Makefile.in missing mkinstalldirs xxf86misc.pc +*~ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
