diff options
author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-27 17:38:26 +0000 |
---|---|---|
committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-27 17:38:26 +0000 |
commit | 53d88757f19d68914cc9402c375be8fb9e7af66b (patch) | |
tree | 0f676829e6d40971ea2a57846ec4a48b09101f88 | |
parent | 061341467baa72bf04d519166f933b4f666862c1 (diff) |
Check in lbxutil build system
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | COPYING | 22 | ||||
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | INSTALL | 8 | ||||
-rw-r--r-- | Makefile.am | 31 | ||||
-rw-r--r-- | NEWS | 0 | ||||
-rw-r--r-- | README | 10 | ||||
-rwxr-xr-x | autogen.sh | 12 | ||||
-rw-r--r-- | configure.ac | 58 | ||||
-rw-r--r-- | lbxutil.pc.in | 10 | ||||
-rw-r--r-- | src/Makefile.am | 46 | ||||
-rw-r--r-- | xfixes.pc.in | 10 |
12 files changed, 217 insertions, 0 deletions
@@ -0,0 +1 @@ +Keith Packard, HP and XFree86. @@ -0,0 +1,22 @@ +$Id$ + +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/ChangeLog b/ChangeLog new file mode 100644 index 0000000..b661c06 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,9 @@ +2005-05-17 <ssp@aware-of-vacuity.boston.redhat.com> + + * configure.ac: Remove rest of half-removed if statement + + * ChangeLog: remove irrelevant entries + +2005-04-16 Josh Triplett <josh@freedesktop.org> + + * Makefile.am: Tell automake about the manpage. @@ -0,0 +1,8 @@ +Xfixes is built with the traditional configure script: + + $ ./configure --prefix=/usr/X11R6 + +This should generate valid Makefiles, then: + + $ make + $ make install diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..662026e --- /dev/null +++ b/Makefile.am @@ -0,0 +1,31 @@ +# +# $Id$ +# +# Copyright © 2003 Keith Packard, Noah Levitt +# +# 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. + +AM_CFLAGS = $(X_CFLAGS) + +SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = lbxutil.pc + +EXTRA_DIST = lbxutil.pc.in autogen.sh @@ -0,0 +1,10 @@ + Xfixes + XFIXES Extension + Version 2.0.1 + 2002-10-4 + +This package contains header files and documentation for the XFIXES +extension. Library and server implementations are separate. + +Keith Packard +keithp@keithp.com 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/configure.ac b/configure.ac new file mode 100644 index 0000000..2c5309c --- /dev/null +++ b/configure.ac @@ -0,0 +1,58 @@ +dnl +dnl $Id$ +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 XFixes version. XFixesQueryVersion +dnl returns the version from xfixeswire.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 Xfixes version l.n.m corresponds to protocol version l.n, +dnl that 'revision' number appears in Xfixes.h and has to be manually +dnl synchronized. +dnl +AC_INIT(lbxutil, 1.0.0, [sandmann@redhat.com], liblbxutil) +AM_INIT_AUTOMAKE([dist-bzip2]) +AM_MAINTAINER_MODE + +AM_CONFIG_HEADER(config.h) + +# Check for progs +AC_PROG_CC +AC_PROG_LIBTOOL + +# Check for X +PKG_CHECK_MODULES(DEP, xextproto) + +AC_SUBST(DEP_CFLAGS) +AC_SUBST(DEP_LIBS) + +# Check fixesext configuration, strip extra digits from package version to +# find the required protocol version + +AC_OUTPUT([Makefile + src/Makefile + lbxutil.pc]) diff --git a/lbxutil.pc.in b/lbxutil.pc.in new file mode 100644 index 0000000..56ceeab --- /dev/null +++ b/lbxutil.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: lbxutil +Description: LBX Utilities +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} @DEP_CFLAGS@ +Libs: -L${libdir} -lXfixes @DEP_LIBS@ diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..3dbd352 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,46 @@ +lib_LTLIBRARIES = liblbxutil.la + +noinst_PROGRAMS = mkg3states + +mkg3states_SOURCES = \ + $(srcdir)/image/mkg3states.c + +BUILT_SOURCES = \ + g3states.h + +liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ + $(srcdir)/lbx_zlib/lbx_zlib_io.c \ + $(srcdir)/lbx_zlib/lbx_zlib.h \ + $(srcdir)/lbx_zlib/lbx_zlib.c \ + $(srcdir)/lbx_zlib/reqstats.c \ + $(srcdir)/image/misc.c \ + $(srcdir)/image/dpackbits.c \ + $(srcdir)/image/epackbits.c \ + $(srcdir)/image/dfaxg42d.c \ + g3states.h \ + $(srcdir)/image/lbxfax.h \ + $(srcdir)/image/efaxg42d.c \ + $(srcdir)/image/lbxbwcodes.h \ + $(srcdir)/delta/lbxdelta.c + +liblbxutil_la_LIBADD = @DEP_LIBS@ + +INCLUDES = @DEP_CFLAGS@ + +g3states.h: mkg3states + mkg3states > g3states.h + +# +# Library version info. Check the libtool docs for +# instructions on when and how to change this value +# +# bump when the ABI changes +LBXUTIL_CURRENT=2 +# bump for non-ABI changes, reset to zero when CURRENT changes +LBXUTIL_REVISION=0 +# bump when the ABI changes in backward-compatible fashion +LBXUTIL_AGE=2 +liblbxutil_la_LDFLAGS = -version-info ${LBXUTIL_CURRENT}:${LBXUTIL_REVISION}:${LBXUTIL_AGE} -no-undefined + +CLEANFILES = g3states.h diff --git a/xfixes.pc.in b/xfixes.pc.in new file mode 100644 index 0000000..1c05e9b --- /dev/null +++ b/xfixes.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Xfixes +Description: X Fixes Library +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} @X_CFLAGS@ +Libs: -L${libdir} -lXfixes @X_LIBS@ |