summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-10 22:38:47 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-10 22:38:47 +0000
commit6303c89f331dc585bf28fd04f8a1018693e89569 (patch)
treee481d90ff678d404f3060bc05483f2f33095e0ca
parent517aed7ebcd3a71177883b495c86a040483ac623 (diff)
Apply patch from Jeff Smith (whydoubt@yahoo.com):
- Add file linking for Xxf86misc, Xxf86dga, and Xxf86vm. - Check in build system for Xxf86misc, Xxf86dga, and Xxf86vm.
-rw-r--r--COPYING11
-rw-r--r--Makefile.am6
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.ac19
-rw-r--r--man/Makefile.am3
-rw-r--r--src/Makefile.am7
-rw-r--r--xxf86misc.pc.in10
7 files changed, 68 insertions, 0 deletions
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..ff6177f
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,11 @@
+Copyright (c) 1995, 1996 The XFree86 Project, Inc
+
+All Rights Reserved.
+
+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, sublicence, 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/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..cdfbd95
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = src man
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xxf86misc.pc
+
+EXTRA_DIST = xxf86misc.pc.in autogen.sh
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..b058bcc
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,19 @@
+AC_PREREQ([2.57])
+
+AC_INIT(libXxf86misc, 1.1.0, [xorg@lists.freedestkop.org], libXxf86misc)
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(src/config.h)
+
+# Check for progs
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
+
+AC_OUTPUT([Makefile
+ src/Makefile
+ man/Makefile
+ xxf86misc.pc])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..9ae5c09
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,3 @@
+man_MANS = XF86Misc.3
+
+EXTRA_DIST = $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..3fb85df
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,7 @@
+lib_LTLIBRARIES = libXxf86misc.la
+
+libXxf86misc_la_SOURCES = XF86Misc.c
+
+libXxf86misc_la_CFLAGS = $(XXF86MISC_CFLAGS)
+libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
+libXxf86misc_la_LDFLAGS = -version-number 1:1:0
diff --git a/xxf86misc.pc.in b/xxf86misc.pc.in
new file mode 100644
index 0000000..b61b60b
--- /dev/null
+++ b/xxf86misc.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Xxf86misc
+Description: XFree86 Misc Extension Library
+Version: @VERSION@
+Cflags: -I${includedir} @XXF86MISC_CFLAGS@
+Libs: -L${libdir} -lXxf86misc @XXF86MISC_LIBS@