From 05b56f65501517507355de2ccdf8b5432254e3c2 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 6 Apr 2010 15:01:29 -0700 Subject: Merge protocol package automake bits This doesn't change what gets installed, just how those bits are constructed. The goal is to produce precisely the same bits as the union of the individual package. This patch was generated using the 'add-configure' script. Signed-off-by: Keith Packard --- Makefile.am | 36 +++ applewmproto/applewmproto.pc.in | 2 +- autogen.sh | 12 + bigreqsproto/bigreqsproto.pc.in | 2 +- calibrateproto/xcalibrateproto.pc.in | 2 +- compositeproto/compositeproto.pc.in | 2 +- configure.ac | 372 +++++++++++++++++++++ damageproto/damageproto.pc.in | 2 +- dmxproto/dmxproto.pc.in | 2 +- dri2proto/dri2proto.pc.in | 2 +- evieproto/evieproto.pc.in | 2 +- fixesproto/fixesproto.pc.in | 2 +- fontcacheproto/fontcacheproto.pc.in | 2 +- fontsproto/fontsproto.pc.in | 2 +- glproto/glproto.pc.in | 2 +- inputproto/inputproto.pc.in | 2 +- kbproto/kbproto.pc.in | 2 +- lg3dproto/Makefile | 555 ++++++++++++++++++-------------- lg3dproto/Makefile.in | 511 ++++++++++++++++------------- lg3dproto/lg3dproto.pc | 2 +- lg3dproto/lg3dproto.pc.in | 2 +- pmproto/xproxymngproto.pc.in | 2 +- printproto/printproto.pc.in | 2 +- randrproto/randrproto.pc.in | 2 +- recordproto/recordproto.pc.in | 2 +- renderproto/renderproto.pc.in | 2 +- resourceproto/resourceproto.pc.in | 2 +- scrnsaverproto/scrnsaverproto.pc.in | 2 +- trapproto/trapproto.pc.in | 2 +- videoproto/videoproto.pc.in | 2 +- windowswmproto/windowswmproto.pc.in | 2 +- x11proto/xproto.pc.in | 2 +- xcmiscproto/xcmiscproto.pc.in | 2 +- xextproto/xextproto.pc.in | 2 +- xf86bigfontproto/xf86bigfontproto.pc.in | 2 +- xf86dgaproto/xf86dgaproto.pc.in | 2 +- xf86driproto/xf86driproto.pc.in | 2 +- xf86miscproto/xf86miscproto.pc.in | 2 +- xf86rushproto/xf86rushproto.pc.in | 2 +- xf86vidmodeproto/xf86vidmodeproto.pc.in | 2 +- xineramaproto/xineramaproto.pc.in | 2 +- 41 files changed, 1054 insertions(+), 504 deletions(-) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..649a6d9 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,36 @@ +SUBDIRS = \ + applewmproto \ + bigreqsproto \ + calibrateproto \ + compositeproto \ + damageproto \ + dmxproto \ + dri2proto \ + evieproto \ + fixesproto \ + fontcacheproto \ + fontsproto \ + glproto \ + inputproto \ + kbproto \ + lg3dproto \ + pmproto \ + printproto \ + randrproto \ + recordproto \ + renderproto \ + resourceproto \ + scrnsaverproto \ + trapproto \ + videoproto \ + windowswmproto \ + x11proto \ + xcmiscproto \ + xextproto \ + xf86bigfontproto \ + xf86dgaproto \ + xf86driproto \ + xf86miscproto \ + xf86rushproto \ + xf86vidmodeproto \ + xineramaproto \ No newline at end of file diff --git a/applewmproto/applewmproto.pc.in b/applewmproto/applewmproto.pc.in index 6ec1c48..abea6b2 100644 --- a/applewmproto/applewmproto.pc.in +++ b/applewmproto/applewmproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: AppleWMProto Description: AppleWM extension headers -Version: @PACKAGE_VERSION@ +Version: @APPLEWMPROTO_VERSION@ Cflags: -I${includedir} diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/bigreqsproto/bigreqsproto.pc.in b/bigreqsproto/bigreqsproto.pc.in index e3adbfd..73ff26a 100644 --- a/bigreqsproto/bigreqsproto.pc.in +++ b/bigreqsproto/bigreqsproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: BigReqsProto Description: BigReqs extension headers -Version: @PACKAGE_VERSION@ +Version: @BIGREQSPROTO_VERSION@ Cflags: -I${includedir} diff --git a/calibrateproto/xcalibrateproto.pc.in b/calibrateproto/xcalibrateproto.pc.in index f17f8d7..26d4c85 100644 --- a/calibrateproto/xcalibrateproto.pc.in +++ b/calibrateproto/xcalibrateproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XCalibrate Description: XCalibrate extension headers -Version: @PACKAGE_VERSION@ +Version: @CALIBRATEPROTO_VERSION@ Cflags: -I${includedir} diff --git a/compositeproto/compositeproto.pc.in b/compositeproto/compositeproto.pc.in index 6348022..8ec7a92 100644 --- a/compositeproto/compositeproto.pc.in +++ b/compositeproto/compositeproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: CompositeExt Description: Composite extension headers -Version: @PACKAGE_VERSION@ +Version: @COMPOSITEPROTO_VERSION@ Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..0124d98 --- /dev/null +++ b/configure.ac @@ -0,0 +1,372 @@ +dnl +dnl Copyright © 2010 Keith Packard +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation, and that the name of Keith Packard not be used in +dnl advertising or publicity pertaining to distribution of the software without +dnl specific, written prior permission. Keith Packard makes no +dnl representations about the suitability of this software for any purpose. It +dnl is provided "as is" without express or implied warranty. +dnl +dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +dnl PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Process this file with autoconf to create configure. + +AC_PREREQ([2.60]) +AC_INIT([Proto], [0.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +# Require xorg-macros: 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) +XORG_DEFAULT_OPTIONS + +APPLEWMPROTO_VERSION=1.4.1 +AC_SUBST(APPLEWMPROTO_VERSION) +BIGREQSPROTO_VERSION=1.1.0 +AC_SUBST(BIGREQSPROTO_VERSION) +CALIBRATEPROTO_VERSION=0.1.0 +AC_SUBST(CALIBRATEPROTO_VERSION) +COMPOSITEPROTO_VERSION=0.4.1 +AC_SUBST(COMPOSITEPROTO_VERSION) +DAMAGEPROTO_VERSION=1.2.0 +AC_SUBST(DAMAGEPROTO_VERSION) +DMXPROTO_VERSION=2.3 +AC_SUBST(DMXPROTO_VERSION) +DRI2PROTO_VERSION=2.3 +AC_SUBST(DRI2PROTO_VERSION) +EVIEPROTO_VERSION=1.1.0 +AC_SUBST(EVIEPROTO_VERSION) +FIXESPROTO_VERSION=4.1.1 +AC_SUBST(FIXESPROTO_VERSION) +FONTCACHEPROTO_VERSION=0.1.3 +AC_SUBST(FONTCACHEPROTO_VERSION) +FONTSPROTO_VERSION=2.1.0 +AC_SUBST(FONTSPROTO_VERSION) +GLPROTO_VERSION=1.4.11 +AC_SUBST(GLPROTO_VERSION) +INPUTPROTO_VERSION=2.0 +AC_SUBST(INPUTPROTO_VERSION) +KBPROTO_VERSION=1.0.4 +AC_SUBST(KBPROTO_VERSION) +LG3DPROTO_VERSION=5.0 +AC_SUBST(LG3DPROTO_VERSION) +PMPROTO_VERSION=1.0.3 +AC_SUBST(PMPROTO_VERSION) +PRINTPROTO_VERSION=1.0.4 +AC_SUBST(PRINTPROTO_VERSION) +RANDRPROTO_VERSION=1.3.1 +AC_SUBST(RANDRPROTO_VERSION) +RECORDPROTO_VERSION=1.14 +AC_SUBST(RECORDPROTO_VERSION) +RENDERPROTO_VERSION=0.11 +AC_SUBST(RENDERPROTO_VERSION) +RESOURCEPROTO_VERSION=1.1.0 +AC_SUBST(RESOURCEPROTO_VERSION) +SCRNSAVERPROTO_VERSION=1.2.0 +AC_SUBST(SCRNSAVERPROTO_VERSION) +TRAPPROTO_VERSION=3.4.3 +AC_SUBST(TRAPPROTO_VERSION) +VIDEOPROTO_VERSION=2.3.0 +AC_SUBST(VIDEOPROTO_VERSION) +WINDOWSWMPROTO_VERSION=1.0.4 +AC_SUBST(WINDOWSWMPROTO_VERSION) +X11PROTO_VERSION=7.0.16 +AC_SUBST(X11PROTO_VERSION) +XCMISCPROTO_VERSION=1.2.0 +AC_SUBST(XCMISCPROTO_VERSION) +XEXTPROTO_VERSION=7.1.1 +AC_SUBST(XEXTPROTO_VERSION) +XF86BIGFONTPROTO_VERSION=1.2.0 +AC_SUBST(XF86BIGFONTPROTO_VERSION) +XF86DGAPROTO_VERSION=2.1 +AC_SUBST(XF86DGAPROTO_VERSION) +XF86DRIPROTO_VERSION=2.1.0 +AC_SUBST(XF86DRIPROTO_VERSION) +XF86MISCPROTO_VERSION=0.9.3 +AC_SUBST(XF86MISCPROTO_VERSION) +XF86RUSHPROTO_VERSION=1.1.2 +AC_SUBST(XF86RUSHPROTO_VERSION) +XF86VIDMODEPROTO_VERSION=2.3 +AC_SUBST(XF86VIDMODEPROTO_VERSION) +XINERAMAPROTO_VERSION=1.2 +AC_SUBST(XINERAMAPROTO_VERSION) + +AC_CONFIG_HEADER([x11proto/do-not-use-config.h]) +AC_CONFIG_HEADER([x11proto/Xfuncproto.h]) + +AC_CANONICAL_HOST + +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +# Check for enable/disable options +AC_ARG_ENABLE(function-prototypes, + AS_HELP_STRING([--enable-function-prototypes], + [force function prototypes (default: auto)]), + [FUNCPROTO=$enableval], [FUNCPROTO=auto]) +AC_ARG_ENABLE(varargs-prototypes, + AS_HELP_STRING([--enable-varargs-prototypes], + [varargs prototypes are supported (default: auto)]), + [VAPROTO=$enableval], [VAPROTO=auto]) +AC_ARG_ENABLE(const-prototypes, + AS_HELP_STRING([--enable-const-prototypes], + [const is supported (default: auto)]), + [CONSTPROTO=$enableval], [CONSTPROTO=auto]) +AC_ARG_ENABLE(nested-prototypes, + AS_HELP_STRING([--enable-nested-prototypes], + [nested prototypes are supported (default: auto)]), + [NESTEDPROTO=$enableval], [NESTEDPROTO=auto]) +AC_ARG_ENABLE(wide-prototypes, + AS_HELP_STRING([--enable-wide-prototypes], + [widen function prototypes (default: auto)]), + [WIDEPROTO=$enableval], [WIDEPROTO=auto]) + + +AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h]) + +# Handle Xpoll.h.in +# Avoid determining fds_bits on WIN32 hosts (not including cygwin) +case $host_os in + mingw*) fds_bits_found=true;; + *) fds_bits_found=false;; +esac + +if test "x$fds_bits_found" = xfalse ; then + AC_CHECK_MEMBER(fd_set.fds_bits, + [ + fds_bits_found=plain + USE_FDS_BITS="fds_bits" + ],, + [ + #ifdef HAVE_SYS_PARAM_H + #include + #endif + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #ifdef HAVE_SYS_SELECT_H + #include + #endif + ]) +fi + +if test "x$fds_bits_found" = xfalse ; then + AC_CHECK_MEMBER(fd_set.__fds_bits, + [ + fds_bits_found=underscores + USE_FDS_BITS="__fds_bits" + ],, + [ + #ifdef HAVE_SYS_PARAM_H + #include + #endif + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #ifdef HAVE_SYS_SELECT_H + #include + #endif + ]) +fi + +if test "x$fds_bits_found" = xfalse ; then + AC_MSG_ERROR([Could not determine how to access the fds_bits or equivalent + structure in fd_set on your platform.]) +fi + +AC_SUBST([USE_FDS_BITS]) + + +# Handle Xfuncproto.h +AC_MSG_CHECKING([whether const prototypes are supported]) +if test "x$CONSTPROTO" = xauto; then + case $host_os in + linux*) CONSTPROTO=yes ;; + freebsd*) CONSTPROTO=yes ;; + netbsd*) CONSTPROTO=yes ;; + openbsd*) CONSTPROTO=yes ;; + solaris*) CONSTPROTO=yes ;; + *) CONSTPROTO=no ;; + esac +fi +AC_MSG_RESULT([$CONSTPROTO]) + +AC_MSG_CHECKING([whether varargs prototypes are supported]) +if test "x$VAPROTO" = xauto; then + case $host_os in + linux*) VAPROTO=yes ;; + freebsd*) VAPROTO=yes ;; + netbsd*) VAPROTO=yes ;; + openbsd*) VAPROTO=yes ;; + solaris*) VAPROTO=yes ;; + *) VAPROTO=no ;; + esac +fi +AC_MSG_RESULT([$VAPROTO]) + +AC_MSG_CHECKING([whether nested prototypes are supported]) +if test "x$NESTEDPROTO" = xauto; then + case $host_os in + linux*) NESTEDPROTO=yes ;; + freebsd*) NESTEDPROTO=yes ;; + netbsd*) NESTEDPROTO=yes ;; + openbsd*) NESTEDPROTO=yes ;; + solaris*) NESTEDPROTO=yes ;; + *) NESTEDPROTO=no ;; + esac +fi +AC_MSG_RESULT([$NESTEDPROTO]) + +AC_MSG_CHECKING([whether to force function prototypes]) +if test "x$FUNCPROTO" = xauto; then + case $host_os in + linux*) FUNCPROTO=yes ;; + freebsd*) FUNCPROTO=yes ;; + netbsd*) FUNCPROTO=yes ;; + openbsd*) FUNCPROTO=yes ;; + *) + if test "x$VAPROTO" = xyes && test "x$NESTEDPROTO" = xyes; then + FUNCPROTO=yes + else + FUNCPROTO=no + fi + ;; + esac +fi +AC_MSG_RESULT([$FUNCPROTO]) + +# Logic for this was taken from Imake.tmpl +if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes && test "x$NESTEDPROTO" = xyes && test "x$CONSTPROTO" = xyes; then + AC_DEFINE(FUNCPROTO, [15], [FUNCPROTO]) +else + if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes && test "x$NESTEDPROTO" = xyes; then + AC_DEFINE(FUNCPROTO, [11], [FUNCPROTO]) + else + if test "x$FUNCPROTO" = xyes && test "x$NESTEDPROTO" = xyes; then + AC_DEFINE(FUNCPROTO, [9], [FUNCPROTO]) + else + if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes && test "x$CONSTPROTO" = xyes; then + AC_DEFINE(FUNCPROTO, [7], [FUNCPROTO]) + else + if test "x$FUNCPROTO" = xyes && test "x$CONSTPROTO" = xyes; then + AC_DEFINE(FUNCPROTO, [5], [FUNCPROTO]) + else + if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes; then + AC_DEFINE(FUNCPROTO, [3], [FUNCPROTO]) + else + if test "x$FUNCPROTO" = xyes; then + AC_DEFINE(FUNCPROTO, [], [FUNCPROTO]) + fi + fi + fi + fi + fi + fi +fi + +AC_MSG_CHECKING([whether to widen function prototypes]) +if test "x$WIDEPROTO" = xauto; then + case $host_os in + linux*) WIDEPROTO=no ;; + freebsd*) WIDEPROTO=no ;; + netbsd*) WIDEPROTO=no ;; + openbsd*) WIDEPROTO=no ;; + *) WIDEPROTO=yes ;; + esac +fi +AC_MSG_RESULT([$WIDEPROTO]) + +if test "x$WIDEPROTO" = xno; then + AC_DEFINE(NARROWPROTO, [], [Narrow prototypes]) +fi + + +AC_OUTPUT([Makefile + applewmproto/Makefile + applewmproto/applewmproto.pc + bigreqsproto/Makefile + bigreqsproto/bigreqsproto.pc + calibrateproto/Makefile + calibrateproto/xcalibrateproto.pc + compositeproto/Makefile + compositeproto/compositeproto.pc + damageproto/Makefile + damageproto/damageproto.pc + dmxproto/Makefile + dmxproto/dmxproto.pc + dri2proto/Makefile + dri2proto/dri2proto.pc + evieproto/Makefile + evieproto/evieproto.pc + fixesproto/Makefile + fixesproto/fixesproto.pc + fontcacheproto/Makefile + fontcacheproto/fontcacheproto.pc + fontsproto/Makefile + fontsproto/fontsproto.pc + glproto/Makefile + glproto/glproto.pc + inputproto/Makefile + inputproto/inputproto.pc + kbproto/Makefile + kbproto/kbproto.pc + lg3dproto/Makefile + lg3dproto/lg3dproto.pc + pmproto/Makefile + pmproto/xproxymngproto.pc + printproto/Makefile + printproto/printproto.pc + randrproto/Makefile + randrproto/randrproto.pc + recordproto/Makefile + recordproto/recordproto.pc + renderproto/Makefile + renderproto/renderproto.pc + resourceproto/Makefile + resourceproto/resourceproto.pc + scrnsaverproto/Makefile + scrnsaverproto/scrnsaverproto.pc + trapproto/Makefile + trapproto/trapproto.pc + videoproto/Makefile + videoproto/videoproto.pc + windowswmproto/Makefile + windowswmproto/windowswmproto.pc + x11proto/Makefile + x11proto/Xpoll.h + x11proto/xproto.pc + xcmiscproto/Makefile + xcmiscproto/xcmiscproto.pc + xextproto/Makefile + xextproto/xextproto.pc + xf86bigfontproto/Makefile + xf86bigfontproto/xf86bigfontproto.pc + xf86dgaproto/Makefile + xf86dgaproto/xf86dgaproto.pc + xf86driproto/Makefile + xf86driproto/xf86driproto.pc + xf86miscproto/Makefile + xf86miscproto/xf86miscproto.pc + xf86rushproto/Makefile + xf86rushproto/xf86rushproto.pc + xf86vidmodeproto/Makefile + xf86vidmodeproto/xf86vidmodeproto.pc + xineramaproto/Makefile + xineramaproto/xineramaproto.pc]) diff --git a/damageproto/damageproto.pc.in b/damageproto/damageproto.pc.in index 25476b9..6cf2dc4 100644 --- a/damageproto/damageproto.pc.in +++ b/damageproto/damageproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: DamageProto Description: Damage extension headers -Version: @PACKAGE_VERSION@ +Version: @DAMAGEPROTO_VERSION@ Cflags: -I${includedir} diff --git a/dmxproto/dmxproto.pc.in b/dmxproto/dmxproto.pc.in index 97cd1b8..d50208b 100644 --- a/dmxproto/dmxproto.pc.in +++ b/dmxproto/dmxproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: DMXProto Description: DMX extension headers -Version: @PACKAGE_VERSION@ +Version: @DMXPROTO_VERSION@ Cflags: -I${includedir} diff --git a/dri2proto/dri2proto.pc.in b/dri2proto/dri2proto.pc.in index 647416e..387fafb 100644 --- a/dri2proto/dri2proto.pc.in +++ b/dri2proto/dri2proto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: DRI2Proto Description: DRI2 extension headers -Version: @PACKAGE_VERSION@ +Version: @DRI2PROTO_VERSION@ Cflags: -I${includedir} diff --git a/evieproto/evieproto.pc.in b/evieproto/evieproto.pc.in index 795a1cd..d7214d7 100644 --- a/evieproto/evieproto.pc.in +++ b/evieproto/evieproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: EvIEExt Description: EvIE extension headers -Version: @PACKAGE_VERSION@ +Version: @EVIEPROTO_VERSION@ Cflags: -I${includedir} diff --git a/fixesproto/fixesproto.pc.in b/fixesproto/fixesproto.pc.in index fabce86..14a16f1 100644 --- a/fixesproto/fixesproto.pc.in +++ b/fixesproto/fixesproto.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: FixesProto Description: X Fixes extension headers -Version: @PACKAGE_VERSION@ +Version: @FIXESPROTO_VERSION@ Cflags: -I${includedir} Requires: xextproto >= 7.0.99.1 diff --git a/fontcacheproto/fontcacheproto.pc.in b/fontcacheproto/fontcacheproto.pc.in index afb2127..50706a5 100644 --- a/fontcacheproto/fontcacheproto.pc.in +++ b/fontcacheproto/fontcacheproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: FontcacheProto Description: Fontcache extension headers -Version: @PACKAGE_VERSION@ +Version: @FONTCACHEPROTO_VERSION@ Cflags: -I${includedir} diff --git a/fontsproto/fontsproto.pc.in b/fontsproto/fontsproto.pc.in index b7db169..d4388a7 100644 --- a/fontsproto/fontsproto.pc.in +++ b/fontsproto/fontsproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: FontsProto Description: Fonts extension headers -Version: @PACKAGE_VERSION@ +Version: @FONTSPROTO_VERSION@ Cflags: -I${includedir} diff --git a/glproto/glproto.pc.in b/glproto/glproto.pc.in index bd275d8..a07c38c 100644 --- a/glproto/glproto.pc.in +++ b/glproto/glproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: GLProto Description: GL extension headers -Version: @PACKAGE_VERSION@ +Version: @GLPROTO_VERSION@ Cflags: -I${includedir} diff --git a/inputproto/inputproto.pc.in b/inputproto/inputproto.pc.in index c499cda..366382d 100644 --- a/inputproto/inputproto.pc.in +++ b/inputproto/inputproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: InputProto Description: Input extension headers -Version: @PACKAGE_VERSION@ +Version: @INPUTPROTO_VERSION@ Cflags: -I${includedir} diff --git a/kbproto/kbproto.pc.in b/kbproto/kbproto.pc.in index 02a6d44..f24de9a 100644 --- a/kbproto/kbproto.pc.in +++ b/kbproto/kbproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: KBProto Description: KB extension headers -Version: @PACKAGE_VERSION@ +Version: @KBPROTO_VERSION@ Cflags: -I${includedir} diff --git a/lg3dproto/Makefile b/lg3dproto/Makefile index f2e53ca..beb6d2c 100644 --- a/lg3dproto/Makefile +++ b/lg3dproto/Makefile @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# Makefile. Generated from Makefile.in by configure. +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# lg3dproto/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,16 +15,35 @@ - -srcdir = . -top_srcdir = . - -pkgdatadir = $(datadir)/lg3dproto -pkglibdir = $(libdir)/lg3dproto -pkgincludedir = $(includedir)/lg3dproto -top_builddir = . +# Copyright (c) 2004, Sun Microsystems, Inc. +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation. +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# SUN MICROSYSTEMS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of Sun Microsystems shall not be +# used in advertising or otherwise to promote the sale, use or other dealings +# in this Software without prior written authorization from Sun Microsystems. + + + +pkgdatadir = $(datadir)/proto +pkgincludedir = $(includedir)/proto +pkglibdir = $(libdir)/proto +pkglibexecdir = $(libexecdir)/proto am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,19 +55,27 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -subdir = . -DIST_COMMON = $(am__configure_deps) $(lg3d_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/lg3dproto.pc.in $(top_srcdir)/configure COPYING \ - ChangeLog install-sh missing +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu +subdir = lg3dproto +DIST_COMMON = README $(lg3d_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/lg3dproto.pc.in AUTHORS \ + COPYING ChangeLog INSTALL 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 = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/x11proto/do-not-use-config.h \ + $(top_builddir)/x11proto/Xfuncproto.h CONFIG_CLEAN_FILES = lg3dproto.pc +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -55,339 +83,349 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(lg3ddir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) -lg3dHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(lg3d_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = aclocal -I /home/dj4236/lgn/x/xorg/cvs/head/modular/share/aclocal -AMTAR = ${SHELL} /home/dj4236/lgn/x/xorg/cvs/head/proto/Lg3d/missing --run tar -AUTOCONF = ${SHELL} /home/dj4236/lgn/x/xorg/cvs/head/proto/Lg3d/missing --run autoconf -AUTOHEADER = ${SHELL} /home/dj4236/lgn/x/xorg/cvs/head/proto/Lg3d/missing --run autoheader -AUTOMAKE = ${SHELL} /home/dj4236/lgn/x/xorg/cvs/head/proto/Lg3d/missing --run automake-1.9 +ACLOCAL = aclocal -I /local/xorg/share/aclocal +ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX) +ADMIN_MAN_SUFFIX = 8 +AMTAR = ${SHELL} /local/src/xorg/newproto/proto/missing --run tar +AM_DEFAULT_VERBOSITY = 0 +APPLEWMPROTO_VERSION = 1.4.1 +APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX) +APP_MAN_SUFFIX = 1 +AUTOCONF = ${SHELL} /local/src/xorg/newproto/proto/missing --run autoconf +AUTOHEADER = ${SHELL} /local/src/xorg/newproto/proto/missing --run autoheader +AUTOMAKE = ${SHELL} /local/src/xorg/newproto/proto/missing --run automake-1.11 AWK = gawk +BIGREQSPROTO_VERSION = 1.1.0 +CALIBRATEPROTO_VERSION = 0.1.0 +CC = gcc -std=gnu99 +CCDEPMODE = depmode=none +CFLAGS = -g -O2 +CHANGELOG_CMD = (GIT_DIR=$(top_srcdir)/.git git log > $(top_srcdir)/.changelog.tmp && mv $(top_srcdir)/.changelog.tmp $(top_srcdir)/ChangeLog) || (rm -f $(top_srcdir)/.changelog.tmp; touch $(top_srcdir)/ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) +COMPOSITEPROTO_VERSION = 0.4.1 +CPP = gcc -E +CPPFLAGS = +CWARNFLAGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -Wbad-function-cast -Wformat=2 -Wold-style-definition -Wdeclaration-after-statement CYGPATH_W = echo -DEFS = -DPACKAGE_NAME=\"Lg3dProto\" -DPACKAGE_TARNAME=\"lg3dproto\" -DPACKAGE_VERSION=\"5.0\" -DPACKAGE_STRING=\"Lg3dProto\ 5.0\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE=\"lg3dproto\" -DVERSION=\"5.0\" +DAMAGEPROTO_VERSION = 1.2.0 +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +DMXPROTO_VERSION = 2.3 +DRI2PROTO_VERSION = 2.3 +DRIVER_MAN_DIR = $(mandir)/man$(DRIVER_MAN_SUFFIX) +DRIVER_MAN_SUFFIX = 4 ECHO_C = ECHO_N = -n ECHO_T = +EGREP = /bin/grep -E +EVIEPROTO_VERSION = 1.1.0 +EXEEXT = +FILE_MAN_DIR = $(mandir)/man$(FILE_MAN_SUFFIX) +FILE_MAN_SUFFIX = 5 +FIXESPROTO_VERSION = 4.1.1 +FONTCACHEPROTO_VERSION = 0.1.3 +FONTSPROTO_VERSION = 2.1.0 +GLPROTO_VERSION = 1.4.11 +GREP = /bin/grep +INPUTPROTO_VERSION = 2.0 +INSTALL = /local/xorg/bin/install-check +INSTALL_CMD = (cp -f /local/xorg/share/util-macros/INSTALL $(top_srcdir)/.INSTALL.tmp && mv $(top_srcdir)/.INSTALL.tmp $(top_srcdir)/INSTALL) || (rm -f $(top_srcdir)/.INSTALL.tmp; touch $(top_srcdir)/INSTALL; echo 'util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2) INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +KBPROTO_VERSION = 1.0.4 +LDFLAGS = +LG3DPROTO_VERSION = 5.0 LIBOBJS = LIBS = +LIB_MAN_DIR = $(mandir)/man$(LIB_MAN_SUFFIX) +LIB_MAN_SUFFIX = 3 LTLIBOBJS = -MAKEINFO = ${SHELL} /home/dj4236/lgn/x/xorg/cvs/head/proto/Lg3d/missing --run makeinfo -PACKAGE = lg3dproto +MAINT = +MAKEINFO = ${SHELL} /local/src/xorg/newproto/proto/missing --run makeinfo +MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX) +MISC_MAN_SUFFIX = 7 +MKDIR_P = /bin/mkdir -p +OBJEXT = o +PACKAGE = proto PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -PACKAGE_NAME = Lg3dProto -PACKAGE_STRING = Lg3dProto 5.0 -PACKAGE_TARNAME = lg3dproto -PACKAGE_VERSION = 5.0 +PACKAGE_NAME = Proto +PACKAGE_STRING = Proto 0.0.99.1 +PACKAGE_TARNAME = proto +PACKAGE_URL = +PACKAGE_VERSION = 0.0.99.1 PATH_SEPARATOR = : +PKG_CONFIG = /usr/bin/pkg-config +PMPROTO_VERSION = 1.0.3 +PRINTPROTO_VERSION = 1.0.4 +RANDRPROTO_VERSION = 1.3.1 +RECORDPROTO_VERSION = 1.14 +RENDERPROTO_VERSION = 0.11 +RESOURCEPROTO_VERSION = 1.1.0 +SCRNSAVERPROTO_VERSION = 1.2.0 SET_MAKE = SHELL = /bin/sh STRIP = -VERSION = 5.0 -ac_ct_STRIP = +TRAPPROTO_VERSION = 3.4.3 +USE_FDS_BITS = __fds_bits +VERSION = 0.0.99.1 +VIDEOPROTO_VERSION = 2.3.0 +WINDOWSWMPROTO_VERSION = 1.0.4 +X11PROTO_VERSION = 7.0.16 +XCMISCPROTO_VERSION = 1.2.0 +XEXTPROTO_VERSION = 7.1.1 +XF86BIGFONTPROTO_VERSION = 1.2.0 +XF86DGAPROTO_VERSION = 2.1 +XF86DRIPROTO_VERSION = 2.1.0 +XF86MISCPROTO_VERSION = 0.9.3 +XF86RUSHPROTO_VERSION = 1.1.2 +XF86VIDMODEPROTO_VERSION = 2.3 +XINERAMAPROTO_VERSION = 1.2 +abs_builddir = /local/src/xorg/newproto/proto/lg3dproto +abs_srcdir = /local/src/xorg/newproto/proto/lg3dproto +abs_top_builddir = /local/src/xorg/newproto/proto +abs_top_srcdir = /local/src/xorg/newproto/proto +ac_ct_CC = gcc +am__include = include am__leading_dot = . +am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin +build = x86_64-unknown-linux-gnu build_alias = -datadir = ${prefix}/share +build_cpu = x86_64 +build_os = linux-gnu +build_vendor = unknown +builddir = . +datadir = ${datarootdir} +datarootdir = ${prefix}/share +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +dvidir = ${docdir} exec_prefix = ${prefix} +host = x86_64-unknown-linux-gnu host_alias = +host_cpu = x86_64 +host_os = linux-gnu +host_vendor = unknown +htmldir = ${docdir} includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/dj4236/lgn/x/xorg/cvs/head/proto/Lg3d/install-sh +infodir = ${datarootdir}/info +install_sh = ${SHELL} /local/src/xorg/newproto/proto/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec +localedir = ${datarootdir}/locale localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- +mandir = ${datarootdir}/man +mkdir_p = /bin/mkdir -p oldincludedir = /usr/include -prefix = /home/dj4236/lgn/x/xorg/cvs/head/modular +pdfdir = ${docdir} +prefix = /local/xorg-new program_transform_name = s,x,x, +psdir = ${docdir} sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com +srcdir = . sysconfdir = ${prefix}/etc target_alias = +top_build_prefix = ../ +top_builddir = .. +top_srcdir = .. lg3ddir = $(includedir)/X11/extensions lg3d_HEADERS = lgewire.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = lg3dproto.pc -EXTRA_DIST = autogen.sh lg3dproto.pc.in +EXTRA_DIST = autogen.sh lg3dproto.pc.in ChangeLog +MAINTAINERCLEANFILES = ChangeLog all: all-am .SUFFIXES: -am--refresh: - @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lg3dproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign lg3dproto/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): lg3dproto.pc: $(top_builddir)/config.status $(srcdir)/lg3dproto.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -uninstall-info-am: + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files install-lg3dHEADERS: $(lg3d_HEADERS) @$(NORMAL_INSTALL) - test -z "$(lg3ddir)" || $(mkdir_p) "$(DESTDIR)$(lg3ddir)" - @list='$(lg3d_HEADERS)'; for p in $$list; do \ + test -z "$(lg3ddir)" || $(MKDIR_P) "$(DESTDIR)$(lg3ddir)" + @list='$(lg3d_HEADERS)'; test -n "$(lg3ddir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(lg3dHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(lg3ddir)/$$f'"; \ - $(lg3dHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(lg3ddir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(lg3ddir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(lg3ddir)" || exit $$?; \ done uninstall-lg3dHEADERS: @$(NORMAL_UNINSTALL) - @list='$(lg3d_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(lg3ddir)/$$f'"; \ - rm -f "$(DESTDIR)$(lg3ddir)/$$f"; \ - done + @list='$(lg3d_HEADERS)'; test -n "$(lg3ddir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(lg3ddir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(lg3ddir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(lg3ddir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -409,16 +447,17 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags @@ -428,23 +467,41 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: install-data-am: install-lg3dHEADERS install-pkgconfigDATA +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -460,22 +517,30 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-lg3dHEADERS \ - uninstall-pkgconfigDATA - -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - 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-lg3dHEADERS install-man install-pkgconfigDATA \ - 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-lg3dHEADERS \ - uninstall-pkgconfigDATA +uninstall-am: uninstall-lg3dHEADERS uninstall-pkgconfigDATA + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + ctags dist-hook distclean distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-lg3dHEADERS install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am 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-lg3dHEADERS uninstall-pkgconfigDATA + + +.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 # 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/lg3dproto/Makefile.in b/lg3dproto/Makefile.in index 54c57c4..1d4d748 100644 --- a/lg3dproto/Makefile.in +++ b/lg3dproto/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,16 +15,35 @@ @SET_MAKE@ +# Copyright (c) 2004, Sun Microsystems, Inc. +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation. +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# SUN MICROSYSTEMS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of Sun Microsystems shall not be +# used in advertising or otherwise to promote the sale, use or other dealings +# in this Software without prior written authorization from Sun Microsystems. + -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,19 +55,27 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -subdir = . -DIST_COMMON = $(am__configure_deps) $(lg3d_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/lg3dproto.pc.in $(top_srcdir)/configure COPYING \ - ChangeLog install-sh missing +build_triplet = @build@ +host_triplet = @host@ +subdir = lg3dproto +DIST_COMMON = README $(lg3d_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/lg3dproto.pc.in AUTHORS \ + COPYING ChangeLog INSTALL 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 = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/x11proto/do-not-use-config.h \ + $(top_builddir)/x11proto/Xfuncproto.h CONFIG_CLEAN_FILES = lg3dproto.pc +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -55,339 +83,349 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(lg3ddir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) -lg3dHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(lg3d_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLEWMPROTO_VERSION = @APPLEWMPROTO_VERSION@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BIGREQSPROTO_VERSION = @BIGREQSPROTO_VERSION@ +CALIBRATEPROTO_VERSION = @CALIBRATEPROTO_VERSION@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +COMPOSITEPROTO_VERSION = @COMPOSITEPROTO_VERSION@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ +DAMAGEPROTO_VERSION = @DAMAGEPROTO_VERSION@ DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DMXPROTO_VERSION = @DMXPROTO_VERSION@ +DRI2PROTO_VERSION = @DRI2PROTO_VERSION@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EVIEPROTO_VERSION = @EVIEPROTO_VERSION@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FIXESPROTO_VERSION = @FIXESPROTO_VERSION@ +FONTCACHEPROTO_VERSION = @FONTCACHEPROTO_VERSION@ +FONTSPROTO_VERSION = @FONTSPROTO_VERSION@ +GLPROTO_VERSION = @GLPROTO_VERSION@ +GREP = @GREP@ +INPUTPROTO_VERSION = @INPUTPROTO_VERSION@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KBPROTO_VERSION = @KBPROTO_VERSION@ +LDFLAGS = @LDFLAGS@ +LG3DPROTO_VERSION = @LG3DPROTO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PMPROTO_VERSION = @PMPROTO_VERSION@ +PRINTPROTO_VERSION = @PRINTPROTO_VERSION@ +RANDRPROTO_VERSION = @RANDRPROTO_VERSION@ +RECORDPROTO_VERSION = @RECORDPROTO_VERSION@ +RENDERPROTO_VERSION = @RENDERPROTO_VERSION@ +RESOURCEPROTO_VERSION = @RESOURCEPROTO_VERSION@ +SCRNSAVERPROTO_VERSION = @SCRNSAVERPROTO_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TRAPPROTO_VERSION = @TRAPPROTO_VERSION@ +USE_FDS_BITS = @USE_FDS_BITS@ VERSION = @VERSION@ -ac_ct_STRIP = @ac_ct_STRIP@ +VIDEOPROTO_VERSION = @VIDEOPROTO_VERSION@ +WINDOWSWMPROTO_VERSION = @WINDOWSWMPROTO_VERSION@ +X11PROTO_VERSION = @X11PROTO_VERSION@ +XCMISCPROTO_VERSION = @XCMISCPROTO_VERSION@ +XEXTPROTO_VERSION = @XEXTPROTO_VERSION@ +XF86BIGFONTPROTO_VERSION = @XF86BIGFONTPROTO_VERSION@ +XF86DGAPROTO_VERSION = @XF86DGAPROTO_VERSION@ +XF86DRIPROTO_VERSION = @XF86DRIPROTO_VERSION@ +XF86MISCPROTO_VERSION = @XF86MISCPROTO_VERSION@ +XF86RUSHPROTO_VERSION = @XF86RUSHPROTO_VERSION@ +XF86VIDMODEPROTO_VERSION = @XF86VIDMODEPROTO_VERSION@ +XINERAMAPROTO_VERSION = @XINERAMAPROTO_VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ +host = @host@ host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ lg3ddir = $(includedir)/X11/extensions lg3d_HEADERS = lgewire.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = lg3dproto.pc -EXTRA_DIST = autogen.sh lg3dproto.pc.in +EXTRA_DIST = autogen.sh lg3dproto.pc.in ChangeLog +MAINTAINERCLEANFILES = ChangeLog all: all-am .SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lg3dproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign lg3dproto/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): lg3dproto.pc: $(top_builddir)/config.status $(srcdir)/lg3dproto.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -uninstall-info-am: + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files install-lg3dHEADERS: $(lg3d_HEADERS) @$(NORMAL_INSTALL) - test -z "$(lg3ddir)" || $(mkdir_p) "$(DESTDIR)$(lg3ddir)" - @list='$(lg3d_HEADERS)'; for p in $$list; do \ + test -z "$(lg3ddir)" || $(MKDIR_P) "$(DESTDIR)$(lg3ddir)" + @list='$(lg3d_HEADERS)'; test -n "$(lg3ddir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(lg3dHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(lg3ddir)/$$f'"; \ - $(lg3dHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(lg3ddir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(lg3ddir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(lg3ddir)" || exit $$?; \ done uninstall-lg3dHEADERS: @$(NORMAL_UNINSTALL) - @list='$(lg3d_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(lg3ddir)/$$f'"; \ - rm -f "$(DESTDIR)$(lg3ddir)/$$f"; \ - done + @list='$(lg3d_HEADERS)'; test -n "$(lg3ddir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(lg3ddir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(lg3ddir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(lg3ddir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -409,16 +447,17 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags @@ -428,23 +467,41 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: install-data-am: install-lg3dHEADERS install-pkgconfigDATA +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -460,22 +517,30 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-lg3dHEADERS \ - uninstall-pkgconfigDATA - -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - 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-lg3dHEADERS install-man install-pkgconfigDATA \ - 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-lg3dHEADERS \ - uninstall-pkgconfigDATA +uninstall-am: uninstall-lg3dHEADERS uninstall-pkgconfigDATA + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + ctags dist-hook distclean distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-lg3dHEADERS install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am 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-lg3dHEADERS uninstall-pkgconfigDATA + + +.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 # 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/lg3dproto/lg3dproto.pc b/lg3dproto/lg3dproto.pc index 020b364..a54a446 100644 --- a/lg3dproto/lg3dproto.pc +++ b/lg3dproto/lg3dproto.pc @@ -1,4 +1,4 @@ -prefix=/home/dj4236/lgn/x/xorg/cvs/head/modular +prefix=/local/xorg-new exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/lg3dproto/lg3dproto.pc.in b/lg3dproto/lg3dproto.pc.in index 11ae302..fbafc5d 100644 --- a/lg3dproto/lg3dproto.pc.in +++ b/lg3dproto/lg3dproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: Lg3dProto Description: LGE extension headers -Version: @PACKAGE_VERSION@ +Version: @LG3DPROTO_VERSION@ Cflags: -I${includedir} diff --git a/pmproto/xproxymngproto.pc.in b/pmproto/xproxymngproto.pc.in index 4c4afcc..a3c1f92 100644 --- a/pmproto/xproxymngproto.pc.in +++ b/pmproto/xproxymngproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XProxyManagementProtocol Description: X Proxy Management Protocol headers -Version: @PACKAGE_VERSION@ +Version: @PMPROTO_VERSION@ Cflags: -I${includedir} diff --git a/printproto/printproto.pc.in b/printproto/printproto.pc.in index e43f540..e4125e2 100644 --- a/printproto/printproto.pc.in +++ b/printproto/printproto.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: PrintProto Description: Print extension headers -Version: @PACKAGE_VERSION@ +Version: @PRINTPROTO_VERSION@ Requires: xau Cflags: -I${includedir} diff --git a/randrproto/randrproto.pc.in b/randrproto/randrproto.pc.in index d94d353..cf645f5 100644 --- a/randrproto/randrproto.pc.in +++ b/randrproto/randrproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: RandrProto Description: Randr extension headers -Version: @PACKAGE_VERSION@ +Version: @RANDRPROTO_VERSION@ Cflags: -I${includedir} diff --git a/recordproto/recordproto.pc.in b/recordproto/recordproto.pc.in index 77cd38f..cba91fd 100644 --- a/recordproto/recordproto.pc.in +++ b/recordproto/recordproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: RecordProto Description: Record extension headers -Version: @PACKAGE_VERSION@ +Version: @RECORDPROTO_VERSION@ Cflags: -I${includedir} diff --git a/renderproto/renderproto.pc.in b/renderproto/renderproto.pc.in index 17331e9..eb99bf9 100644 --- a/renderproto/renderproto.pc.in +++ b/renderproto/renderproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: RenderProto Description: Render extension headers -Version: @PACKAGE_VERSION@ +Version: @RENDERPROTO_VERSION@ Cflags: -I${includedir} diff --git a/resourceproto/resourceproto.pc.in b/resourceproto/resourceproto.pc.in index 2851df1..6a1a50d 100644 --- a/resourceproto/resourceproto.pc.in +++ b/resourceproto/resourceproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: ResourceProto Description: Resource extension headers -Version: @PACKAGE_VERSION@ +Version: @RESOURCEPROTO_VERSION@ Cflags: -I${includedir} diff --git a/scrnsaverproto/scrnsaverproto.pc.in b/scrnsaverproto/scrnsaverproto.pc.in index 87f9ddc..b6fbf6a 100644 --- a/scrnsaverproto/scrnsaverproto.pc.in +++ b/scrnsaverproto/scrnsaverproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: ScrnSaverProto Description: ScrnSaver extension headers -Version: @PACKAGE_VERSION@ +Version: @SCRNSAVERPROTO_VERSION@ Cflags: -I${includedir} diff --git a/trapproto/trapproto.pc.in b/trapproto/trapproto.pc.in index 563d720..308cbe1 100644 --- a/trapproto/trapproto.pc.in +++ b/trapproto/trapproto.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: TrapProto Description: Trap extension headers -Version: @PACKAGE_VERSION@ +Version: @TRAPPROTO_VERSION@ Requires: xt Cflags: -I${includedir} diff --git a/videoproto/videoproto.pc.in b/videoproto/videoproto.pc.in index 5840540..55cbd16 100644 --- a/videoproto/videoproto.pc.in +++ b/videoproto/videoproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: VideoProto Description: Video extension headers -Version: @PACKAGE_VERSION@ +Version: @VIDEOPROTO_VERSION@ Cflags: -I${includedir} diff --git a/windowswmproto/windowswmproto.pc.in b/windowswmproto/windowswmproto.pc.in index 09f8a3a..cc621aa 100644 --- a/windowswmproto/windowswmproto.pc.in +++ b/windowswmproto/windowswmproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: WindowsWMProto Description: WindowsWM extension headers -Version: @PACKAGE_VERSION@ +Version: @WINDOWSWMPROTO_VERSION@ Cflags: -I${includedir} diff --git a/x11proto/xproto.pc.in b/x11proto/xproto.pc.in index 63ae864..cc9863d 100644 --- a/x11proto/xproto.pc.in +++ b/x11proto/xproto.pc.in @@ -6,5 +6,5 @@ includex11dir=@includedir@/X11 Name: Xproto Description: Xproto headers -Version: @PACKAGE_VERSION@ +Version: @X11PROTO_VERSION@ Cflags: -I${includedir} diff --git a/xcmiscproto/xcmiscproto.pc.in b/xcmiscproto/xcmiscproto.pc.in index 86b030a..107aad8 100644 --- a/xcmiscproto/xcmiscproto.pc.in +++ b/xcmiscproto/xcmiscproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XCMiscProto Description: XCMisc extension headers -Version: @PACKAGE_VERSION@ +Version: @XCMISCPROTO_VERSION@ Cflags: -I${includedir} diff --git a/xextproto/xextproto.pc.in b/xextproto/xextproto.pc.in index e85200f..90c2fc4 100644 --- a/xextproto/xextproto.pc.in +++ b/xextproto/xextproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XExtProto Description: XExt extension headers -Version: @PACKAGE_VERSION@ +Version: @XEXTPROTO_VERSION@ Cflags: -I${includedir} diff --git a/xf86bigfontproto/xf86bigfontproto.pc.in b/xf86bigfontproto/xf86bigfontproto.pc.in index 0db8c18..14a6793 100644 --- a/xf86bigfontproto/xf86bigfontproto.pc.in +++ b/xf86bigfontproto/xf86bigfontproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XF86BigFontProto Description: XF86BigFont extension headers -Version: @PACKAGE_VERSION@ +Version: @XF86BIGFONTPROTO_VERSION@ Cflags: -I${includedir} diff --git a/xf86dgaproto/xf86dgaproto.pc.in b/xf86dgaproto/xf86dgaproto.pc.in index fd1fc6e..2e9a83c 100644 --- a/xf86dgaproto/xf86dgaproto.pc.in +++ b/xf86dgaproto/xf86dgaproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XF86DGAProto Description: XF86DGA extension headers -Version: @PACKAGE_VERSION@ +Version: @XF86DGAPROTO_VERSION@ Cflags: -I${includedir} diff --git a/xf86driproto/xf86driproto.pc.in b/xf86driproto/xf86driproto.pc.in index b52f9e3..bcaf457 100644 --- a/xf86driproto/xf86driproto.pc.in +++ b/xf86driproto/xf86driproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XF86DRIProto Description: XF86DRI extension headers -Version: @PACKAGE_VERSION@ +Version: @XF86DRIPROTO_VERSION@ Cflags: -I${includedir}/X11/dri diff --git a/xf86miscproto/xf86miscproto.pc.in b/xf86miscproto/xf86miscproto.pc.in index eb72923..73d73ca 100644 --- a/xf86miscproto/xf86miscproto.pc.in +++ b/xf86miscproto/xf86miscproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XF86MiscProto Description: XF86Misc extension headers -Version: @PACKAGE_VERSION@ +Version: @XF86MISCPROTO_VERSION@ Cflags: -I${includedir} diff --git a/xf86rushproto/xf86rushproto.pc.in b/xf86rushproto/xf86rushproto.pc.in index deb5615..a893d06 100644 --- a/xf86rushproto/xf86rushproto.pc.in +++ b/xf86rushproto/xf86rushproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XF86RushProto Description: XF86Rush extension headers -Version: @PACKAGE_VERSION@ +Version: @XF86RUSHPROTO_VERSION@ Cflags: -I${includedir} diff --git a/xf86vidmodeproto/xf86vidmodeproto.pc.in b/xf86vidmodeproto/xf86vidmodeproto.pc.in index afbb702..bb7516c 100644 --- a/xf86vidmodeproto/xf86vidmodeproto.pc.in +++ b/xf86vidmodeproto/xf86vidmodeproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XF86VidModeProto Description: XF86VidMode extension headers -Version: @PACKAGE_VERSION@ +Version: @XF86VIDMODEPROTO_VERSION@ Cflags: -I${includedir} diff --git a/xineramaproto/xineramaproto.pc.in b/xineramaproto/xineramaproto.pc.in index 8d1074d..ae1a628 100644 --- a/xineramaproto/xineramaproto.pc.in +++ b/xineramaproto/xineramaproto.pc.in @@ -5,5 +5,5 @@ includedir=@includedir@ Name: XineramaProto Description: Xinerama extension headers -Version: @PACKAGE_VERSION@ +Version: @XINERAMAPROTO_VERSION@ Cflags: -I${includedir} -- cgit v1.2.3