summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-08-20 03:32:09 +0000
committerAdam Jackson <ajax@nwnk.net>2005-08-20 03:32:09 +0000
commit017174085f162484277b2f798d35d3436a26e005 (patch)
tree31a0d461dca620b5e03e99cf81cdf6c21836b8da
parent1abd165f5bd627a6eebf333135d5a1b5a32d7aa3 (diff)
Fix silly install issue by moving the header install rules for shared-core
into shared-core/Makefile.am. Bump to 1.0.3.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
-rw-r--r--libdrm/Makefile.am30
-rw-r--r--shared-core/Makefile.am49
4 files changed, 52 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am
index 6cbd52a9..8c5dc702 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
# here too, but let's just do libdrm for now
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libdrm
+SUBDIRS = libdrm shared-core
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm.pc
diff --git a/configure.ac b/configure.ac
index 0c2f76c8..688a4ec0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AC_PREREQ(2.57)
-AC_INIT([libdrm], 1.0.2, [dri-devel@lists.sourceforge.net], libdrm)
+AC_INIT([libdrm], 1.0.3, [dri-devel@lists.sourceforge.net], libdrm)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -33,4 +33,4 @@ AC_HEADER_STDC
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
-AC_OUTPUT([Makefile libdrm/Makefile libdrm.pc])
+AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm.pc])
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index fd346365..db8778f1 100644
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -27,33 +27,3 @@ libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
libdrmincludedir = ${includedir}
libdrminclude_HEADERS = xf86drm.h
-
-klibdrmincludedir = ${includedir}/drm
-klibdrminclude_HEADERS = \
- ../shared-core/drm.h \
- ../shared-core/drm_sarea.h \
- ../shared-core/i915_drm.h \
- ../shared-core/i915_drv.h \
- ../shared-core/imagine_drv.h \
- ../shared-core/mach64_drm.h \
- ../shared-core/mach64_drv.h \
- ../shared-core/mga_drm.h \
- ../shared-core/mga_drv.h \
- ../shared-core/mga_ucode.h \
- ../shared-core/r128_drm.h \
- ../shared-core/r128_drv.h \
- ../shared-core/r300_reg.h \
- ../shared-core/radeon_drm.h \
- ../shared-core/radeon_drv.h \
- ../shared-core/savage_drm.h \
- ../shared-core/savage_drv.h \
- ../shared-core/sis_drm.h \
- ../shared-core/sis_drv.h \
- ../shared-core/sis_ds.h \
- ../shared-core/tdfx_drv.h \
- ../shared-core/via_3d_reg.h \
- ../shared-core/via_drm.h \
- ../shared-core/via_drv.h \
- ../shared-core/via_ds.h \
- ../shared-core/via_mm.h \
- ../shared-core/via_verifier.h
diff --git a/shared-core/Makefile.am b/shared-core/Makefile.am
new file mode 100644
index 00000000..b227f784
--- /dev/null
+++ b/shared-core/Makefile.am
@@ -0,0 +1,49 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 (including the next
+# paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON 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.
+
+klibdrmincludedir = ${includedir}/drm
+klibdrminclude_HEADERS = \
+ drm.h \
+ drm_sarea.h \
+ i915_drm.h \
+ i915_drv.h \
+ imagine_drv.h \
+ mach64_drm.h \
+ mach64_drv.h \
+ mga_drm.h \
+ mga_drv.h \
+ mga_ucode.h \
+ r128_drm.h \
+ r128_drv.h \
+ r300_reg.h \
+ radeon_drm.h \
+ radeon_drv.h \
+ savage_drm.h \
+ savage_drv.h \
+ sis_drm.h \
+ sis_drv.h \
+ sis_ds.h \
+ tdfx_drv.h \
+ via_3d_reg.h \
+ via_drm.h \
+ via_drv.h \
+ via_ds.h \
+ via_mm.h \
+ via_verifier.h