diff options
author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-05-18 19:38:36 +0000 |
---|---|---|
committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-05-18 19:38:36 +0000 |
commit | 2e403190ff21b0bb277391a73741cfc6d5005ac3 (patch) | |
tree | 716cd6292e13f646e8801d0c77c0b834fcaeffc5 | |
parent | 7cea083d37cfaaad321bddca0fb75b3308956938 (diff) | |
download | xorg-lib-libXmu-2e403190ff21b0bb277391a73741cfc6d5005ac3.tar.gz |
- Add Xmu build system
-rw-r--r-- | AUTHORS | 0 | ||||
-rw-r--r-- | COPYING | 74 | ||||
-rw-r--r-- | ChangeLog | 128 | ||||
-rw-r--r-- | INSTALL | 229 | ||||
-rw-r--r-- | Makefile.am | 11 | ||||
-rw-r--r-- | NEWS | 0 | ||||
-rw-r--r-- | README | 14 | ||||
-rwxr-xr-x | autogen.sh | 12 | ||||
-rw-r--r-- | configure.ac | 55 | ||||
-rw-r--r-- | include/Makefile.am | 24 | ||||
-rw-r--r-- | src/Makefile.am | 61 | ||||
-rw-r--r-- | xmu.pc.in | 10 | ||||
-rw-r--r-- | xmuu.pc.in | 10 |
13 files changed, 623 insertions, 5 deletions
@@ -0,0 +1,74 @@ +Copyright 1989, 1998 The Open Group + +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 THE +OPEN GROUP 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 The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +----------- + +Xmu/StrToBmap.c and Xmu/GrayPixmap.c also have: + +Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +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 Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL 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. + +----------- + +And Xmu/Clip.c has: + +Copyright (c) 1998 by The XFree86 Project, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +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 +THE XFREE86 PROJECT 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 the XFree86 Project shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from the +XFree86 Project. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..ca9f9e8 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,128 @@ +2005-01-29 Daniel Stone <daniel@freedesktop.org> + + * CvtStdSel.c (get_os_name): + Change uname == 0 to uname >= 0 (X.Org HEAD). + + * include/X11/Xmu/SysUtil.h: + * include/X11/Xmu/Xmu.h: + Add gcc format attribute (X.Org HEAD). + +2005-01-01 Phil Blundell <philb@gnu.org> + + * configure.ac (XMUU_CFLAGS, XMUU_LIBS): New. + * xmuu.pc.in: Use XMUU_CFLAGS+XMUU_LIBS, not XMU_CFLAGS+XMU_LIBS. + +2004-05-17 Eric Anholt <anholt@FreeBSD.org> + + * EditresCom.c: + * WidgetNode.c: (XmuWnFetchResources): + Axe the Xaw header dependency again. + +2004-05-10 Eric Anholt <anholt@FreeBSD.org> + + * configure.ac: + * xmu.pc.in: + * xmuu.pc.in: + Properly include LIBS/CFLAGS in .pc and linking. + Bump to version 6.2.3. + +2004-04-13 Daniel Stone <daniel@freedesktop.org> + + * EditresCom.c: + X11R6.7 merge - various minor cleanups. + + * Bump version to 6.2.2 for xlibs 1.0.1. + +2004-03-17 Carlos Romero <kidcrash@bellsouth.net> + + (Commit sponsored by Daniel Stone.) + * Makefile.am: + * xmu.pc.in: + * configure.ac: + Various cleanups to build system, including correct use of pkg-config. + +2003-12-23 Jeremy C. Reed <reed@reedmedia.net> + + * ChangeLog + Caught up on all missing by me starting Dec. 16. + +2003-12-23 Jeremy C. Reed <reed@reedmedia.net> + + * Makefile.am + * configure.ac + Fix versions for Xmu and Xmuu libraries. Using + -version-number 6:2:1 for Xmu. And using -version-info + 1:0:1 for Xmuu. (This may be out of order, need to test + again.) + +2003-12-23 Jeremy C. Reed <reed@reedmedia.net> + + * configure.ac + * xmu.pc.in + * xmuu.pc.in + Fix LIBS and CFLAGS for xmuu.pc.in and xmu.pc.in. Also use + pkgconfig info for Xt for xmu.pc.in. + +2003-12-23 Jeremy C. Reed <reed@reedmedia.net> + + * EditresCom.c + * WidgetNode.c + Get rid of X11/Xaw/Cardinals.h include. Xmu should + not depend on Xaw to build, because Xaw needs many Xmu + functions to build. In WidgetNode.c, define ZERO (which + X11/Xaw/Cardinals.h would define). + +2003-12-17 Jeremy C. Reed <reed@reedmedia.net> + + * Makefile.am + Don't repeat source filenames for both Xmu and Xmuu. + Just list in libXmuu_la_SOURCES; and use that variable in + the libXmu_la_SOURCES list. (As suggested by keithp on + xlibs@ list.) + +2003-12-16 Jeremy C. Reed <reed@reedmedia.net> + + * .cvsignore + Add two ltconfig related files for CVS to ignore. + +2003-12-16 Jeremy C. Reed <reed@reedmedia.net> + + * Lower.c + Comment out snprintf.c include. (Maybe as a temporary + workaround.) Later, maybe have autoconf check for it. + +2003-12-16 Jeremy C. Reed <reed@reedmedia.net> + + * INSTALL + Add autoconf (./configure) INSTALL instructions. + +2003-12-16 Jeremy C. Reed <reed@reedmedia.net> + + * AUTHORS + * COPYING + * ChangeLog + * Makefile.am + * NEWS + * autogen.sh + * configure.ac + * xmu.pc.in + * xmuu.pc.in + Add beginnings of autoconf/automake/pkgconfig framework for Xmu + and mini Xmu (Xmuu). + +2003-12-16 Jeremy C. Reed <reed@reedmedia.net> + + * include/Makefile.am + Using automake/autoconf for headers. (Note that + headers from original xc/Xmu were moved in CVS to this + Xmu/include/X11/Xmu/ directory.) + +2003-12-16 Jeremy C. Reed <reed@reedmedia.net> + + * include/.cvsignore + Add .cvsignore for CVS to ignore Makefile and Makefile.in. + +2003-12-16 Jeremy C. Reed <reed@reedmedia.net> + + * .cvsignore + Add .cvsignore to list files that should be ignored by CVS. @@ -0,0 +1,229 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the `--target=TYPE' option to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..980b985 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,11 @@ +# $Id$ + +SUBDIRS = include src + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xmu.pc xmuu.pc + +EXTRA_DIST = \ + xmu.pc.in \ + xmuu.pc.in \ + autogen.sh @@ -1,8 +1,12 @@ -This library contains miscellaneous utilities and is not part of the Xlib -standard. It contains routines which only use public interfaces so that it -may be layered on top of any proprietary implementation of Xlib or Xt. +This Xmu library contains miscellaneous utilities and is not part +of the Xlib standard. It contains routines which only use public +interfaces so that it may be layered on top of any proprietary +implementation of Xlib or Xt. It is intended to support clients in the MIT distribution; vendors may choose not to distribute this library if they wish. Therefore, -applications developers who depend on this library should be prepared to -treat it as part of their software base when porting. +applications developers who depend on this library should be prepared +to treat it as part of their software base when porting. + +This also includes the Mini Xmu library which does not use Xt and +Xaw. 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..4060107 --- /dev/null +++ b/configure.ac @@ -0,0 +1,55 @@ + +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.57) + +# todo: figure out the versioning +AC_INIT([libXmu], + 6.2.3, + [reed@reedmedia.net], + libXmu) + +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_AUX_DIR(.) +AM_INIT_AUTOMAKE([dist-bzip2]) + +AM_MAINTAINER_MODE + +AM_CONFIG_HEADER([config.h]) + +# Checks for programs. +AC_PROG_LIBTOOL +AC_PROG_CC + +# Checks for pkg-config packages +PKG_CHECK_MODULES(XMU, xt xext) +AC_SUBST(XMU_CFLAGS) +AC_SUBST(XMU_LIBS) + +PKG_CHECK_MODULES(XMUU, x11) +AC_SUBST(XMUU_CFLAGS) +AC_SUBST(XMUU_LIBS) + +# +# Assume that we have sprintf. If a system shows up +# that doesn't, we will deal with it at that point. +# +# The way to deal with it is: +# +# 1. Add a test for sprintf it here in configure.ac +# that sets or unsets HAS_SNPRINTF as appropriate +# +# 2. add a copy of xc/lib/misc/snprintf.c +# +# The source file in question is Lower.c +# + +AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()]) +AC_SUBST(HAS_SNPRINTF) + +AC_OUTPUT([Makefile + include/Makefile + src/Makefile + xmu.pc + xmuu.pc]) diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..f28021f --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,24 @@ +xmuincludedir=${includedir}/X11/Xmu +xmuinclude_HEADERS = \ + X11/Xmu/Xmu.h \ + X11/Xmu/Atoms.h \ + X11/Xmu/CharSet.h \ + X11/Xmu/CloseHook.h \ + X11/Xmu/Converters.h \ + X11/Xmu/CurUtil.h \ + X11/Xmu/CvtCache.h \ + X11/Xmu/DisplayQue.h \ + X11/Xmu/Drawing.h \ + X11/Xmu/Editres.h \ + X11/Xmu/EditresP.h \ + X11/Xmu/Error.h \ + X11/Xmu/ExtAgent.h \ + X11/Xmu/Initer.h \ + X11/Xmu/Lookup.h \ + X11/Xmu/Misc.h \ + X11/Xmu/StdSel.h \ + X11/Xmu/StdCmap.h \ + X11/Xmu/SysUtil.h \ + X11/Xmu/WidgetNode.h \ + X11/Xmu/WinUtil.h \ + X11/Xmu/Xct.h diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..3e57af7 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,61 @@ +lib_LTLIBRARIES = libXmu.la libXmuu.la + +AM_CFLAGS = \ + -I${top_srcdir}/include \ + -I${top_srcdir}/include/X11/Xmu \ + $(XMU_CFLAGS) + +libXmu_la_LDFLAGS = -version-number 6:2:1 +libXmuu_la_LDFLAGS = -version-number 1:0:1 + +libXmu_la_LIBADD = $(XMU_LIBS) + +libXmuu_la_SOURCES = \ + ClientWin.c \ + CursorName.c \ + DefErrMsg.c \ + GetHost.c \ + Lower.c + +libXmu_la_SOURCES = \ + $(libXmuu_la_SOURCES) \ + AllCmap.c \ + Atoms.c \ + Clip.c \ + CloseHook.c \ + CmapAlloc.c \ + CrCmap.c \ + CrPixFBit.c \ + CvtCache.c \ + CvtStdSel.c \ + DelCmap.c \ + DisplayQue.c \ + Distinct.c \ + DrawLogo.c \ + DrRndRect.c \ + EditresCom.c \ + ExtAgent.c \ + FToCback.c \ + GrayPixmap.c \ + Initer.c \ + LocBitmap.c \ + Lookup.c \ + LookupCmap.c \ + RdBitF.c \ + ScrOfWin.c \ + ShapeWidg.c \ + StdCmap.c \ + StrToBS.c \ + StrToBmap.c \ + StrToCurs.c \ + StrToGrav.c \ + StrToJust.c \ + StrToLong.c \ + StrToOrnt.c \ + StrToShap.c \ + StrToWidg.c \ + UpdMapHint.c \ + VisCmap.c \ + WidgetNode.c \ + Xct.c \ + sharedlib.c diff --git a/xmu.pc.in b/xmu.pc.in new file mode 100644 index 0000000..a504827 --- /dev/null +++ b/xmu.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Xmu +Description: Xmu Library +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lXmu @XMU_LIBS@ +Cflags: -I${includedir} @XMU_CFLAGS@ diff --git a/xmuu.pc.in b/xmuu.pc.in new file mode 100644 index 0000000..46f5b9f --- /dev/null +++ b/xmuu.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Xmuu +Description: Mini Xmu Library +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lXmuu @XMUU_LIBS@ +Cflags: -I${includedir} @XMUU_CFLAGS@ |