From a28be4aa9cdb455493e47b9459c2d72a7c6acee4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 23 Jun 2015 16:24:56 +0200 Subject: library clean-up: No autotools cruft in nx-libs. --- nx-X11/lib/Xcomposite/AUTHORS | 1 - nx-X11/lib/Xcomposite/COPYING | 22 ------- nx-X11/lib/Xcomposite/ChangeLog | 19 ------ nx-X11/lib/Xcomposite/INSTALL | 8 --- nx-X11/lib/Xcomposite/Imakefile | 12 ---- nx-X11/lib/Xcomposite/NEWS | 0 nx-X11/lib/Xcomposite/README | 10 ---- nx-X11/lib/Xcomposite/autogen.sh | 3 - nx-X11/lib/Xcomposite/configure.ac | 102 --------------------------------- nx-X11/lib/Xcomposite/xcomposite.pc.in | 10 ---- 10 files changed, 187 deletions(-) delete mode 100644 nx-X11/lib/Xcomposite/AUTHORS delete mode 100644 nx-X11/lib/Xcomposite/COPYING delete mode 100644 nx-X11/lib/Xcomposite/ChangeLog delete mode 100644 nx-X11/lib/Xcomposite/INSTALL delete mode 100644 nx-X11/lib/Xcomposite/NEWS delete mode 100644 nx-X11/lib/Xcomposite/README delete mode 100755 nx-X11/lib/Xcomposite/autogen.sh delete mode 100644 nx-X11/lib/Xcomposite/configure.ac delete mode 100644 nx-X11/lib/Xcomposite/xcomposite.pc.in (limited to 'nx-X11/lib/Xcomposite') diff --git a/nx-X11/lib/Xcomposite/AUTHORS b/nx-X11/lib/Xcomposite/AUTHORS deleted file mode 100644 index 8e18f9b42..000000000 --- a/nx-X11/lib/Xcomposite/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Keith Packard, HP diff --git a/nx-X11/lib/Xcomposite/COPYING b/nx-X11/lib/Xcomposite/COPYING deleted file mode 100644 index e85d981e7..000000000 --- a/nx-X11/lib/Xcomposite/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.1 2004/07/31 05:50:39 anholt Exp $ - -Copyright © 2001,2003 Keith Packard - -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, and that the name of Keith Packard not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. Keith Packard makes no -representations about the suitability of this software for any purpose. It -is provided "as is" without express or implied warranty. - -KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - diff --git a/nx-X11/lib/Xcomposite/ChangeLog b/nx-X11/lib/Xcomposite/ChangeLog deleted file mode 100644 index f70ce6605..000000000 --- a/nx-X11/lib/Xcomposite/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2004-07-08 Keith Packard - - * Makefile.am: - * Xcomposite.c: (XCompositeVersion), (XCompositeNameWindowPixmap): - * Xcomposite.h: - * configure.ac: - Add library API for Composite 0.2 changes - Add XCompositeVersion to get the run-time library version number - Fix package version number in configure.ac and Xcomposite.h - -2004-02-03 Jim Gettys - - * AUTHORS: Add authors to AUTHORS file - -2004-01-15 Daniel Stone - * Tag release 1.0 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. diff --git a/nx-X11/lib/Xcomposite/INSTALL b/nx-X11/lib/Xcomposite/INSTALL deleted file mode 100644 index 25a014e2e..000000000 --- a/nx-X11/lib/Xcomposite/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xcomposite is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile index 0f3c44da4..a8e4077fa 100644 --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -54,15 +54,3 @@ SUBSTVARS=prefix="$(PROJECTROOT)" \ #include DependTarget() - -all:: xcomposite.pc - -xcomposite.pc: xcomposite.pc.in - RemoveFile($@) - sh ../Xrender/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@ - -InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xcomposite.pc) - diff --git a/nx-X11/lib/Xcomposite/NEWS b/nx-X11/lib/Xcomposite/NEWS deleted file mode 100644 index e69de29bb..000000000 diff --git a/nx-X11/lib/Xcomposite/README b/nx-X11/lib/Xcomposite/README deleted file mode 100644 index 9968c6bdf..000000000 --- a/nx-X11/lib/Xcomposite/README +++ /dev/null @@ -1,10 +0,0 @@ - RandR - X RandR Extension - Version 1.0 - 2002-10-4 - -This package contains header files and documentation for the X RandR -extension. Library and server implementations are separate. - -Keith Packard -keithp@keithp.com diff --git a/nx-X11/lib/Xcomposite/autogen.sh b/nx-X11/lib/Xcomposite/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xcomposite/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xcomposite/configure.ac b/nx-X11/lib/Xcomposite/configure.ac deleted file mode 100644 index 8e8848194..000000000 --- a/nx-X11/lib/Xcomposite/configure.ac +++ /dev/null @@ -1,102 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.1 2004/07/31 05:50:39 anholt Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -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.57]) - -dnl -dnl Version should match the current XComposite version. XCompositeQueryVersion -dnl returns the version from xcompositewire.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xcomposite version l.n.m corresponds to protocol version l.n -dnl that 'revision' number appears in Xcomposite.h and has to be manually -dnl synchronized. -dnl -AC_INIT(libXcomposite, 0.2.0, [keithp@keithp.com], libXcomposite) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) -AC_SUBST(X_CFLAGS) -AC_SUBST(X_LIBS) - -if test "$x_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - X_LIBS="$X_LIBS -lX11" - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi -fi - -# Check compositeext configuration, strip extra digits from package version to -# find the required protocol version - -if test "$VERSION" = "" ; then - VERSION=$PACKAGE_VERSION; -fi -COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(XCOMPOSITE, [compositeext >= $COMPOSITEEXT_VERSION] xfixes) -AC_SUBST(XCOMPOSITE_CFLAGS) -AC_SUBST(XCOMPOSITE_LIBS) - -AC_OUTPUT([Makefile - xcomposite.pc]) - diff --git a/nx-X11/lib/Xcomposite/xcomposite.pc.in b/nx-X11/lib/Xcomposite/xcomposite.pc.in deleted file mode 100644 index c319694f1..000000000 --- a/nx-X11/lib/Xcomposite/xcomposite.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xcomposite -Description: X Composite Library -Version: @VERSION@ -Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ -- cgit v1.2.3