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
commit139215564ee6e63101858b9481f3413361a6d4a7 (patch)
tree83208d4db0fd823b720ebf8ec3243b10da966887
parent177b9f5cb3c9108d9547731721efb8cd6064b753 (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--COPYING12
-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--xxf86dga.pc.in10
7 files changed, 69 insertions, 0 deletions
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..1f2ca81
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+Copyright (c) 1995 Jon Tombs
+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..836c78e
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = src man
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xxf86dga.pc
+
+EXTRA_DIST = xxf86dga.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..73fb85b
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,19 @@
+AC_PREREQ([2.57])
+
+AC_INIT(libXxf86dga, 1.0.0, [xorg@lists.freedestkop.org], libXxf86dga)
+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(XXF86DGA, xproto x11 xextproto xext xf86dgaproto)
+
+AC_OUTPUT([Makefile
+ src/Makefile
+ man/Makefile
+ xxf86dga.pc])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..c657848
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,3 @@
+man_MANS = XDGA.3
+
+EXTRA_DIST = $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..5d4b887
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,7 @@
+lib_LTLIBRARIES = libXxf86dga.la
+
+libXxf86dga_la_SOURCES = XF86DGA.c XF86DGA2.c
+
+libXxf86dga_la_CFLAGS = $(XXF86DGA_CFLAGS)
+libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS)
+libXxf86dga_la_LDFLAGS = -version-number 1:0:0
diff --git a/xxf86dga.pc.in b/xxf86dga.pc.in
new file mode 100644
index 0000000..f09aeb3
--- /dev/null
+++ b/xxf86dga.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Xxf86dga
+Description: XFree86 Direct Graphics Access Extension Library
+Version: @VERSION@
+Cflags: -I${includedir} @XXF86DGA_CFLAGS@
+Libs: -L${libdir} -lXxf86dga @XXF86DGA_LIBS@