diff --git a/proto/randrproto/ChangeLog b/proto/randrproto/ChangeLog deleted file mode 100644 index c722b519a..000000000 --- a/proto/randrproto/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/proto/randrproto/Makefile.in b/proto/randrproto/Makefile.in index c24a83480..c2bc8339b 100644 --- a/proto/randrproto/Makefile.in +++ b/proto/randrproto/Makefile.in @@ -39,14 +39,14 @@ subdir = . DIST_COMMON = $(am__configure_deps) $(randr_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/randrproto.pc.in $(top_srcdir)/configure COPYING \ - ChangeLog install-sh missing mkinstalldirs + install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = randrproto.pc SOURCES = DIST_SOURCES = @@ -56,9 +56,11 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(randrdir)" +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(randrdocdir)" "$(DESTDIR)$(randrdir)" pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgconfig_DATA) +randrdocDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pkgconfig_DATA) $(randrdoc_DATA) randrHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(randr_HEADERS) ETAGS = etags @@ -135,7 +137,9 @@ randr_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = randrproto.pc -EXTRA_DIST = autogen.sh randrproto.pc.in +randrdocdir = $(datadir)/doc/$(PACKAGE) +randrdoc_DATA = randrproto.txt +EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA) all: all-am .SUFFIXES: @@ -192,6 +196,23 @@ uninstall-pkgconfigDATA: echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ done +install-randrdocDATA: $(randrdoc_DATA) + @$(NORMAL_INSTALL) + test -z "$(randrdocdir)" || $(mkdir_p) "$(DESTDIR)$(randrdocdir)" + @list='$(randrdoc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(randrdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(randrdocdir)/$$f'"; \ + $(randrdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(randrdocdir)/$$f"; \ + done + +uninstall-randrdocDATA: + @$(NORMAL_UNINSTALL) + @list='$(randrdoc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(randrdocdir)/$$f'"; \ + rm -f "$(DESTDIR)$(randrdocdir)/$$f"; \ + done install-randrHEADERS: $(randr_HEADERS) @$(NORMAL_INSTALL) test -z "$(randrdir)" || $(mkdir_p) "$(DESTDIR)$(randrdir)" @@ -389,7 +410,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(randrdir)"; do \ + for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(randrdocdir)" "$(DESTDIR)$(randrdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -435,7 +456,8 @@ info: info-am info-am: -install-data-am: install-pkgconfigDATA install-randrHEADERS +install-data-am: install-pkgconfigDATA install-randrHEADERS \ + install-randrdocDATA install-exec-am: @@ -464,7 +486,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-info-am uninstall-pkgconfigDATA \ - uninstall-randrHEADERS + uninstall-randrHEADERS uninstall-randrdocDATA .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ @@ -473,11 +495,13 @@ uninstall-am: uninstall-info-am uninstall-pkgconfigDATA \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ - install-pkgconfigDATA install-randrHEADERS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-pkgconfigDATA install-randrHEADERS \ + install-randrdocDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-pkgconfigDATA uninstall-randrHEADERS + uninstall-pkgconfigDATA uninstall-randrHEADERS \ + uninstall-randrdocDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/proto/randrproto/configure b/proto/randrproto/configure index fd44aa64a..5e62b3256 100644 --- a/proto/randrproto/configure +++ b/proto/randrproto/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for RandrProto 1.1.2. +# Generated by GNU Autoconf 2.59 for RandrProto 1.2.1. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='RandrProto' PACKAGE_TARNAME='randrproto' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='RandrProto 1.1.2' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='RandrProto 1.2.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBOBJS LTLIBOBJS' @@ -722,7 +722,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures RandrProto 1.1.2 to adapt to many kinds of systems. +\`configure' configures RandrProto 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -784,7 +784,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RandrProto 1.1.2:";; + short | recursive ) echo "Configuration of RandrProto 1.2.1:";; esac cat <<\_ACEOF @@ -890,7 +890,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -RandrProto configure 1.1.2 +RandrProto configure 1.2.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -904,7 +904,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RandrProto $as_me 1.1.2, which was +It was created by RandrProto $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1547,7 +1547,7 @@ fi # Define the identity of the package. PACKAGE='randrproto' - VERSION='1.1.2' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -2112,7 +2112,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by RandrProto $as_me 1.1.2, which was +This file was extended by RandrProto $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2167,7 +2167,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -RandrProto config.status 1.1.2 +RandrProto config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/proto/randrproto/mkinstalldirs b/proto/randrproto/mkinstalldirs deleted file mode 100644 index 259dbfcd3..000000000 --- a/proto/randrproto/mkinstalldirs +++ /dev/null @@ -1,158 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2005-06-29.22 - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: