summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9dd3613)
raw | patch | inline | side by side (parent: 9dd3613)
author | Kristian Høgsberg <krh@bitplanet.net> | |
Tue, 17 Nov 2009 16:14:54 +0000 (11:14 -0500) | ||
committer | Kristian Høgsberg <krh@bitplanet.net> | |
Tue, 17 Nov 2009 16:15:06 +0000 (11:15 -0500) |
58 files changed:
diff --git a/libdrm/ChangeLog b/ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 31b20e954c8237928c3c81d29cc8c8295aad8767..aa5910106834e25077f0940fb5e90d927ac43ed5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libdrm tests
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm.pc
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm.pc
-EXTRA_DIST = libdrm.pc.in include/drm/*
+if HAVE_INTEL
+INTEL_SUBDIR = intel
+endif
+
+if HAVE_NOUVEAU
+NOUVEAU_SUBDIR = nouveau
+endif
+
+if HAVE_RADEON
+RADEON_SUBDIR = radeon
+endif
+
+SUBDIRS = . $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests
+
+libdrm_la_LTLIBRARIES = libdrm.la
+libdrm_ladir = $(libdir)
+libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
+libdrm_la_LIBADD = @CLOCK_LIB@
+
+libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
+
+libdrm_la_SOURCES = \
+ xf86drm.c \
+ xf86drmHash.c \
+ xf86drmRandom.c \
+ xf86drmSL.c \
+ xf86drmMode.c \
+ libdrm_lists.h
+
+libdrmincludedir = ${includedir}
+libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
+
+EXTRA_DIST = ChangeLog TODO libdrm.pc.in include/drm/*
copy-headers :
cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include
copy-headers :
cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include
diff --git a/libdrm/TODO b/TODO
diff --git a/configure.ac b/configure.ac
index 971dead39f92b9ecb73922722e27523c9cad76a9..857fc0970302d2a9f2278f6fbf19468fe0cbfe91 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
-AM_CONFIG_HEADER([libdrm/config.h])
+AM_CONFIG_HEADER([config.h])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_SUBST(WARN_CFLAGS)
AC_OUTPUT([
Makefile
AC_SUBST(WARN_CFLAGS)
AC_OUTPUT([
Makefile
- libdrm/Makefile
- libdrm/intel/Makefile
- libdrm/intel/libdrm_intel.pc
- libdrm/radeon/Makefile
- libdrm/radeon/libdrm_radeon.pc
- libdrm/nouveau/Makefile
- libdrm/nouveau/libdrm_nouveau.pc
+ intel/Makefile
+ intel/libdrm_intel.pc
+ radeon/Makefile
+ radeon/libdrm_radeon.pc
+ nouveau/Makefile
+ nouveau/libdrm_nouveau.pc
tests/Makefile
tests/modeprint/Makefile
tests/modetest/Makefile
tests/Makefile
tests/modeprint/Makefile
tests/modetest/Makefile
diff --git a/libdrm/intel/Makefile.am b/intel/Makefile.am
similarity index 96%
rename from libdrm/intel/Makefile.am
rename to intel/Makefile.am
index c3c563e4c70fe9e953e2e2c75d78b6518d22fc54..8bb2c6e31b969dd401d26245e683443f6d7fd530 100644 (file)
rename from libdrm/intel/Makefile.am
rename to intel/Makefile.am
index c3c563e4c70fe9e953e2e2c75d78b6518d22fc54..8bb2c6e31b969dd401d26245e683443f6d7fd530 100644 (file)
--- a/libdrm/intel/Makefile.am
+++ b/intel/Makefile.am
AM_CFLAGS = \
$(WARN_CFLAGS) \
AM_CFLAGS = \
$(WARN_CFLAGS) \
- -I$(top_srcdir)/libdrm \
- -I$(top_srcdir)/libdrm/intel \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/intel \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
similarity index 100%
rename from libdrm/intel/intel_bufmgr_fake.c
rename to intel/intel_bufmgr_fake.c
rename from libdrm/intel/intel_bufmgr_fake.c
rename to intel/intel_bufmgr_fake.c
similarity index 100%
rename from libdrm/intel/intel_bufmgr_gem.c
rename to intel/intel_bufmgr_gem.c
rename from libdrm/intel/intel_bufmgr_gem.c
rename to intel/intel_bufmgr_gem.c
similarity index 100%
rename from libdrm/intel/intel_bufmgr_priv.h
rename to intel/intel_bufmgr_priv.h
rename from libdrm/intel/intel_bufmgr_priv.h
rename to intel/intel_bufmgr_priv.h
similarity index 100%
rename from libdrm/intel/libdrm_intel.pc.in
rename to intel/libdrm_intel.pc.in
rename from libdrm/intel/libdrm_intel.pc.in
rename to intel/libdrm_intel.pc.in
diff --git a/libdrm/intel/mm.c b/intel/mm.c
diff --git a/libdrm/intel/mm.h b/intel/mm.h
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
--- a/libdrm/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.
-
-if HAVE_INTEL
-INTEL_SUBDIR = intel
-endif
-
-if HAVE_NOUVEAU
-NOUVEAU_SUBDIR = nouveau
-endif
-
-if HAVE_RADEON
-RADEON_SUBDIR = radeon
-endif
-
-SUBDIRS = . $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR)
-
-libdrm_la_LTLIBRARIES = libdrm.la
-libdrm_ladir = $(libdir)
-libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
-libdrm_la_LIBADD = @CLOCK_LIB@
-
-AM_CFLAGS = -I$(top_srcdir)/include/drm
-libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
- xf86drmMode.c libdrm_lists.h
-
-libdrmincludedir = ${includedir}
-libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
-
-EXTRA_DIST = ChangeLog TODO
diff --git a/libdrm/libdrm_lists.h b/libdrm_lists.h
similarity index 94%
rename from libdrm/nouveau/Makefile.am
rename to nouveau/Makefile.am
index db6243cc39d23b6dd0fa7f23f40b07055ec78df2..70bbbb272a4893790fdb75498e2fd376aef1395a 100644 (file)
rename from libdrm/nouveau/Makefile.am
rename to nouveau/Makefile.am
index db6243cc39d23b6dd0fa7f23f40b07055ec78df2..70bbbb272a4893790fdb75498e2fd376aef1395a 100644 (file)
+++ b/nouveau/Makefile.am
AM_CFLAGS = \
$(WARN_CFLAGS) \
AM_CFLAGS = \
$(WARN_CFLAGS) \
- -I$(top_srcdir)/libdrm \
- -I$(top_srcdir)/libdrm/nouveau \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/nouveau \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
nouveau_resource.h \
nouveau_class.h
nouveau_resource.h \
nouveau_class.h
+
libdrm_nouveauincludedir = ${includedir}/drm
libdrm_nouveauinclude_HEADERS = \
nouveau_drmif.h
libdrm_nouveauincludedir = ${includedir}/drm
libdrm_nouveauinclude_HEADERS = \
nouveau_drmif.h
similarity index 100%
rename from libdrm/nouveau/libdrm_nouveau.pc.in
rename to nouveau/libdrm_nouveau.pc.in
rename from libdrm/nouveau/libdrm_nouveau.pc.in
rename to nouveau/libdrm_nouveau.pc.in
similarity index 100%
rename from libdrm/nouveau/nouveau_channel.c
rename to nouveau/nouveau_channel.c
rename from libdrm/nouveau/nouveau_channel.c
rename to nouveau/nouveau_channel.c
similarity index 100%
rename from libdrm/nouveau/nouveau_channel.h
rename to nouveau/nouveau_channel.h
rename from libdrm/nouveau/nouveau_channel.h
rename to nouveau/nouveau_channel.h
similarity index 100%
rename from libdrm/nouveau/nouveau_device.c
rename to nouveau/nouveau_device.c
rename from libdrm/nouveau/nouveau_device.c
rename to nouveau/nouveau_device.c
similarity index 100%
rename from libdrm/nouveau/nouveau_device.h
rename to nouveau/nouveau_device.h
rename from libdrm/nouveau/nouveau_device.h
rename to nouveau/nouveau_device.h
similarity index 100%
rename from libdrm/nouveau/nouveau_notifier.c
rename to nouveau/nouveau_notifier.c
rename from libdrm/nouveau/nouveau_notifier.c
rename to nouveau/nouveau_notifier.c
similarity index 100%
rename from libdrm/nouveau/nouveau_notifier.h
rename to nouveau/nouveau_notifier.h
rename from libdrm/nouveau/nouveau_notifier.h
rename to nouveau/nouveau_notifier.h
similarity index 100%
rename from libdrm/nouveau/nouveau_private.h
rename to nouveau/nouveau_private.h
rename from libdrm/nouveau/nouveau_private.h
rename to nouveau/nouveau_private.h
similarity index 100%
rename from libdrm/nouveau/nouveau_pushbuf.c
rename to nouveau/nouveau_pushbuf.c
rename from libdrm/nouveau/nouveau_pushbuf.c
rename to nouveau/nouveau_pushbuf.c
similarity index 100%
rename from libdrm/nouveau/nouveau_pushbuf.h
rename to nouveau/nouveau_pushbuf.h
rename from libdrm/nouveau/nouveau_pushbuf.h
rename to nouveau/nouveau_pushbuf.h
similarity index 100%
rename from libdrm/nouveau/nouveau_resource.c
rename to nouveau/nouveau_resource.c
rename from libdrm/nouveau/nouveau_resource.c
rename to nouveau/nouveau_resource.c
similarity index 100%
rename from libdrm/nouveau/nouveau_resource.h
rename to nouveau/nouveau_resource.h
rename from libdrm/nouveau/nouveau_resource.h
rename to nouveau/nouveau_resource.h
diff --git a/libdrm/radeon/Makefile.am b/radeon/Makefile.am
similarity index 96%
rename from libdrm/radeon/Makefile.am
rename to radeon/Makefile.am
index 97801ead78338da59c55102063f1f9318c7484a9..dd136b1f50af1daa7a0e264184498580bb30cc81 100644 (file)
rename from libdrm/radeon/Makefile.am
rename to radeon/Makefile.am
index 97801ead78338da59c55102063f1f9318c7484a9..dd136b1f50af1daa7a0e264184498580bb30cc81 100644 (file)
+++ b/radeon/Makefile.am
AM_CFLAGS = \
$(WARN_CFLAGS) \
AM_CFLAGS = \
$(WARN_CFLAGS) \
- -I$(top_srcdir)/libdrm \
- -I$(top_srcdir)/libdrm/radeon \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/radeon \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
similarity index 100%
rename from libdrm/radeon/libdrm_radeon.pc.in
rename to radeon/libdrm_radeon.pc.in
rename from libdrm/radeon/libdrm_radeon.pc.in
rename to radeon/libdrm_radeon.pc.in
diff --git a/libdrm/radeon/radeon_bo.h b/radeon/radeon_bo.h
diff --git a/libdrm/radeon/radeon_cs.h b/radeon/radeon_cs.h
similarity index 100%
rename from libdrm/radeon/radeon_cs_space.c
rename to radeon/radeon_cs_space.c
rename from libdrm/radeon/radeon_cs_space.c
rename to radeon/radeon_cs_space.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 551589f87fa49903869900428c5188a0b69cc6c5..d044474d42f6918de2f4b88af762650451034b5a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
AM_CPPFLAGS = \
-I $(top_srcdir)/include/drm \
AM_CPPFLAGS = \
-I $(top_srcdir)/include/drm \
- -I $(top_srcdir)/libdrm
+ -I $(top_srcdir)
-LDADD = $(top_builddir)/libdrm/libdrm.la
+LDADD = $(top_builddir)/libdrm.la
noinst_PROGRAMS = \
dristat \
noinst_PROGRAMS = \
dristat \
drmtest.h
libdrmtest_la_LIBADD = \
drmtest.h
libdrmtest_la_LIBADD = \
- $(top_builddir)/libdrm/libdrm.la \
+ $(top_builddir)/libdrm.la \
$(LIBUDEV_LIBS)
LDADD += libdrmtest.la
$(LIBUDEV_LIBS)
LDADD += libdrmtest.la
index 64f2f60314fed12eda01150320201c3d39593c56..2ae0fdc6e35e671b933b11db5bc602696e828445 100644 (file)
AM_CFLAGS = \
-I$(top_srcdir)/include/drm \
AM_CFLAGS = \
-I$(top_srcdir)/include/drm \
- -I$(top_srcdir)/libdrm/intel/ \
- -I$(top_srcdir)/libdrm
+ -I$(top_srcdir)/intel/ \
+ -I$(top_srcdir)
noinst_PROGRAMS = \
modeprint
noinst_PROGRAMS = \
modeprint
modeprint_SOURCES = \
modeprint.c
modeprint_LDADD = \
modeprint_SOURCES = \
modeprint.c
modeprint_LDADD = \
- $(top_builddir)/libdrm/libdrm.la \
- $(top_builddir)/libdrm/intel/libdrm_intel.la
+ $(top_builddir)/libdrm.la \
+ $(top_builddir)/intel/libdrm_intel.la
index 0fd59f1d60be4879bebe16edd4c7456c2a259e03..16f5e99535c8efd2f81e4e2b0c8b2c842b062527 100644 (file)
AM_CFLAGS = \
-I$(top_srcdir)/include/drm \
AM_CFLAGS = \
-I$(top_srcdir)/include/drm \
- -I$(top_srcdir)/libdrm/intel/ \
- -I$(top_srcdir)/libdrm \
+ -I$(top_srcdir)/intel/ \
+ -I$(top_srcdir) \
$(CAIRO_CFLAGS)
noinst_PROGRAMS = \
$(CAIRO_CFLAGS)
noinst_PROGRAMS = \
modetest_SOURCES = \
modetest.c
modetest_LDADD = \
modetest_SOURCES = \
modetest.c
modetest_LDADD = \
- $(top_builddir)/libdrm/libdrm.la \
- $(top_builddir)/libdrm/intel/libdrm_intel.la \
+ $(top_builddir)/libdrm.la \
+ $(top_builddir)/intel/libdrm_intel.la \
$(CAIRO_LIBS)
$(CAIRO_LIBS)
diff --git a/libdrm/xf86drm.c b/xf86drm.c
diff --git a/libdrm/xf86drm.h b/xf86drm.h
diff --git a/libdrm/xf86drmHash.c b/xf86drmHash.c
diff --git a/libdrm/xf86drmMode.c b/xf86drmMode.c
diff --git a/libdrm/xf86drmMode.h b/xf86drmMode.h
diff --git a/libdrm/xf86drmRandom.c b/xf86drmRandom.c
diff --git a/libdrm/xf86drmSL.c b/xf86drmSL.c
diff --git a/libdrm/xf86mm.h b/xf86mm.h