summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog (renamed from libdrm/ChangeLog)0
-rw-r--r--Makefile.am35
-rw-r--r--TODO (renamed from libdrm/TODO)0
-rw-r--r--configure.ac15
-rw-r--r--intel/Makefile.am (renamed from libdrm/intel/Makefile.am)4
-rw-r--r--intel/intel_atomic.h (renamed from libdrm/intel/intel_atomic.h)0
-rw-r--r--intel/intel_bufmgr.c (renamed from libdrm/intel/intel_bufmgr.c)0
-rw-r--r--intel/intel_bufmgr.h (renamed from libdrm/intel/intel_bufmgr.h)0
-rw-r--r--intel/intel_bufmgr_fake.c (renamed from libdrm/intel/intel_bufmgr_fake.c)0
-rw-r--r--intel/intel_bufmgr_gem.c (renamed from libdrm/intel/intel_bufmgr_gem.c)0
-rw-r--r--intel/intel_bufmgr_priv.h (renamed from libdrm/intel/intel_bufmgr_priv.h)0
-rw-r--r--intel/intel_chipset.h (renamed from libdrm/intel/intel_chipset.h)0
-rw-r--r--intel/libdrm_intel.pc.in (renamed from libdrm/intel/libdrm_intel.pc.in)0
-rw-r--r--intel/mm.c (renamed from libdrm/intel/mm.c)0
-rw-r--r--intel/mm.h (renamed from libdrm/intel/mm.h)0
-rw-r--r--libdrm/Makefile.am47
-rw-r--r--libdrm_lists.h (renamed from libdrm/libdrm_lists.h)0
-rw-r--r--nouveau/Makefile.am (renamed from libdrm/nouveau/Makefile.am)5
-rw-r--r--nouveau/libdrm_nouveau.pc.in (renamed from libdrm/nouveau/libdrm_nouveau.pc.in)0
-rw-r--r--nouveau/nouveau_bo.c (renamed from libdrm/nouveau/nouveau_bo.c)0
-rw-r--r--nouveau/nouveau_bo.h (renamed from libdrm/nouveau/nouveau_bo.h)0
-rw-r--r--nouveau/nouveau_channel.c (renamed from libdrm/nouveau/nouveau_channel.c)0
-rw-r--r--nouveau/nouveau_channel.h (renamed from libdrm/nouveau/nouveau_channel.h)0
-rw-r--r--nouveau/nouveau_class.h (renamed from libdrm/nouveau/nouveau_class.h)0
-rw-r--r--nouveau/nouveau_device.c (renamed from libdrm/nouveau/nouveau_device.c)0
-rw-r--r--nouveau/nouveau_device.h (renamed from libdrm/nouveau/nouveau_device.h)0
-rw-r--r--nouveau/nouveau_drmif.h (renamed from libdrm/nouveau/nouveau_drmif.h)0
-rw-r--r--nouveau/nouveau_grobj.c (renamed from libdrm/nouveau/nouveau_grobj.c)0
-rw-r--r--nouveau/nouveau_grobj.h (renamed from libdrm/nouveau/nouveau_grobj.h)0
-rw-r--r--nouveau/nouveau_notifier.c (renamed from libdrm/nouveau/nouveau_notifier.c)0
-rw-r--r--nouveau/nouveau_notifier.h (renamed from libdrm/nouveau/nouveau_notifier.h)0
-rw-r--r--nouveau/nouveau_private.h (renamed from libdrm/nouveau/nouveau_private.h)0
-rw-r--r--nouveau/nouveau_pushbuf.c (renamed from libdrm/nouveau/nouveau_pushbuf.c)0
-rw-r--r--nouveau/nouveau_pushbuf.h (renamed from libdrm/nouveau/nouveau_pushbuf.h)0
-rw-r--r--nouveau/nouveau_resource.c (renamed from libdrm/nouveau/nouveau_resource.c)0
-rw-r--r--nouveau/nouveau_resource.h (renamed from libdrm/nouveau/nouveau_resource.h)0
-rw-r--r--radeon/Makefile.am (renamed from libdrm/radeon/Makefile.am)4
-rw-r--r--radeon/libdrm_radeon.pc.in (renamed from libdrm/radeon/libdrm_radeon.pc.in)0
-rw-r--r--radeon/radeon_bo.h (renamed from libdrm/radeon/radeon_bo.h)0
-rw-r--r--radeon/radeon_bo_gem.c (renamed from libdrm/radeon/radeon_bo_gem.c)0
-rw-r--r--radeon/radeon_bo_gem.h (renamed from libdrm/radeon/radeon_bo_gem.h)0
-rw-r--r--radeon/radeon_cs.h (renamed from libdrm/radeon/radeon_cs.h)0
-rw-r--r--radeon/radeon_cs_gem.c (renamed from libdrm/radeon/radeon_cs_gem.c)0
-rw-r--r--radeon/radeon_cs_gem.h (renamed from libdrm/radeon/radeon_cs_gem.h)0
-rw-r--r--radeon/radeon_cs_space.c (renamed from libdrm/radeon/radeon_cs_space.c)0
-rw-r--r--radeon/radeon_track.c (renamed from libdrm/radeon/radeon_track.c)0
-rw-r--r--radeon/radeon_track.h (renamed from libdrm/radeon/radeon_track.h)0
-rw-r--r--tests/Makefile.am6
-rw-r--r--tests/modeprint/Makefile.am8
-rw-r--r--tests/modetest/Makefile.am8
-rw-r--r--xf86drm.c (renamed from libdrm/xf86drm.c)0
-rw-r--r--xf86drm.h (renamed from libdrm/xf86drm.h)0
-rw-r--r--xf86drmHash.c (renamed from libdrm/xf86drmHash.c)0
-rw-r--r--xf86drmMode.c (renamed from libdrm/xf86drmMode.c)0
-rw-r--r--xf86drmMode.h (renamed from libdrm/xf86drmMode.h)0
-rw-r--r--xf86drmRandom.c (renamed from libdrm/xf86drmRandom.c)0
-rw-r--r--xf86drmSL.c (renamed from libdrm/xf86drmSL.c)0
-rw-r--r--xf86mm.h (renamed from libdrm/xf86mm.h)0
58 files changed, 58 insertions, 74 deletions
diff --git a/libdrm/ChangeLog b/ChangeLog
index 1e740706..1e740706 100644
--- a/libdrm/ChangeLog
+++ b/ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 31b20e95..aa591010 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,12 +19,43 @@
# 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
-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
diff --git a/libdrm/TODO b/TODO
index b6316a29..b6316a29 100644
--- a/libdrm/TODO
+++ b/TODO
diff --git a/configure.ac b/configure.ac
index 971dead3..857fc097 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_USE_SYSTEM_EXTENSIONS
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
@@ -197,13 +197,12 @@ AC_SUBST(kernel_source)
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
diff --git a/libdrm/intel/Makefile.am b/intel/Makefile.am
index c3c563e4..8bb2c6e3 100644
--- a/libdrm/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -24,8 +24,8 @@
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
diff --git a/libdrm/intel/intel_atomic.h b/intel/intel_atomic.h
index e725c4a4..e725c4a4 100644
--- a/libdrm/intel/intel_atomic.h
+++ b/intel/intel_atomic.h
diff --git a/libdrm/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index 2469cd84..2469cd84 100644
--- a/libdrm/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
diff --git a/libdrm/intel/intel_bufmgr.h b/intel/intel_bufmgr.h
index 3801ff31..3801ff31 100644
--- a/libdrm/intel/intel_bufmgr.h
+++ b/intel/intel_bufmgr.h
diff --git a/libdrm/intel/intel_bufmgr_fake.c b/intel/intel_bufmgr_fake.c
index 54b3cb80..54b3cb80 100644
--- a/libdrm/intel/intel_bufmgr_fake.c
+++ b/intel/intel_bufmgr_fake.c
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 87795f33..87795f33 100644
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
diff --git a/libdrm/intel/intel_bufmgr_priv.h b/intel/intel_bufmgr_priv.h
index 475c402f..475c402f 100644
--- a/libdrm/intel/intel_bufmgr_priv.h
+++ b/intel/intel_bufmgr_priv.h
diff --git a/libdrm/intel/intel_chipset.h b/intel/intel_chipset.h
index 688476a4..688476a4 100644
--- a/libdrm/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
diff --git a/libdrm/intel/libdrm_intel.pc.in b/intel/libdrm_intel.pc.in
index ea71cc3e..ea71cc3e 100644
--- a/libdrm/intel/libdrm_intel.pc.in
+++ b/intel/libdrm_intel.pc.in
diff --git a/libdrm/intel/mm.c b/intel/mm.c
index 10697452..10697452 100644
--- a/libdrm/intel/mm.c
+++ b/intel/mm.c
diff --git a/libdrm/intel/mm.h b/intel/mm.h
index 8a5235b0..8a5235b0 100644
--- a/libdrm/intel/mm.h
+++ b/intel/mm.h
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
deleted file mode 100644
index 10de8e3d..00000000
--- 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
index 6410f573..6410f573 100644
--- a/libdrm/libdrm_lists.h
+++ b/libdrm_lists.h
diff --git a/libdrm/nouveau/Makefile.am b/nouveau/Makefile.am
index db6243cc..70bbbb27 100644
--- a/libdrm/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -1,7 +1,7 @@
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
@@ -31,6 +31,7 @@ libdrm_nouveaucommoninclude_HEADERS = \
nouveau_resource.h \
nouveau_class.h
+
libdrm_nouveauincludedir = ${includedir}/drm
libdrm_nouveauinclude_HEADERS = \
nouveau_drmif.h
diff --git a/libdrm/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in
index 7ef49e5a..7ef49e5a 100644
--- a/libdrm/nouveau/libdrm_nouveau.pc.in
+++ b/nouveau/libdrm_nouveau.pc.in
diff --git a/libdrm/nouveau/nouveau_bo.c b/nouveau/nouveau_bo.c
index 85fc14f6..85fc14f6 100644
--- a/libdrm/nouveau/nouveau_bo.c
+++ b/nouveau/nouveau_bo.c
diff --git a/libdrm/nouveau/nouveau_bo.h b/nouveau/nouveau_bo.h
index fdad63ef..fdad63ef 100644
--- a/libdrm/nouveau/nouveau_bo.h
+++ b/nouveau/nouveau_bo.h
diff --git a/libdrm/nouveau/nouveau_channel.c b/nouveau/nouveau_channel.c
index 674c5c37..674c5c37 100644
--- a/libdrm/nouveau/nouveau_channel.c
+++ b/nouveau/nouveau_channel.c
diff --git a/libdrm/nouveau/nouveau_channel.h b/nouveau/nouveau_channel.h
index 294f7497..294f7497 100644
--- a/libdrm/nouveau/nouveau_channel.h
+++ b/nouveau/nouveau_channel.h
diff --git a/libdrm/nouveau/nouveau_class.h b/nouveau/nouveau_class.h
index c7dda02e..c7dda02e 100644
--- a/libdrm/nouveau/nouveau_class.h
+++ b/nouveau/nouveau_class.h
diff --git a/libdrm/nouveau/nouveau_device.c b/nouveau/nouveau_device.c
index 0982d3b6..0982d3b6 100644
--- a/libdrm/nouveau/nouveau_device.c
+++ b/nouveau/nouveau_device.c
diff --git a/libdrm/nouveau/nouveau_device.h b/nouveau/nouveau_device.h
index c0d93335..c0d93335 100644
--- a/libdrm/nouveau/nouveau_device.h
+++ b/nouveau/nouveau_device.h
diff --git a/libdrm/nouveau/nouveau_drmif.h b/nouveau/nouveau_drmif.h
index bc860d2e..bc860d2e 100644
--- a/libdrm/nouveau/nouveau_drmif.h
+++ b/nouveau/nouveau_drmif.h
diff --git a/libdrm/nouveau/nouveau_grobj.c b/nouveau/nouveau_grobj.c
index 2b6e53a5..2b6e53a5 100644
--- a/libdrm/nouveau/nouveau_grobj.c
+++ b/nouveau/nouveau_grobj.c
diff --git a/libdrm/nouveau/nouveau_grobj.h b/nouveau/nouveau_grobj.h
index 51ac7d9b..51ac7d9b 100644
--- a/libdrm/nouveau/nouveau_grobj.h
+++ b/nouveau/nouveau_grobj.h
diff --git a/libdrm/nouveau/nouveau_notifier.c b/nouveau/nouveau_notifier.c
index f8cfd8b9..f8cfd8b9 100644
--- a/libdrm/nouveau/nouveau_notifier.c
+++ b/nouveau/nouveau_notifier.c
diff --git a/libdrm/nouveau/nouveau_notifier.h b/nouveau/nouveau_notifier.h
index dbc6a3b8..dbc6a3b8 100644
--- a/libdrm/nouveau/nouveau_notifier.h
+++ b/nouveau/nouveau_notifier.h
diff --git a/libdrm/nouveau/nouveau_private.h b/nouveau/nouveau_private.h
index 784afc91..784afc91 100644
--- a/libdrm/nouveau/nouveau_private.h
+++ b/nouveau/nouveau_private.h
diff --git a/libdrm/nouveau/nouveau_pushbuf.c b/nouveau/nouveau_pushbuf.c
index 90250c02..90250c02 100644
--- a/libdrm/nouveau/nouveau_pushbuf.c
+++ b/nouveau/nouveau_pushbuf.c
diff --git a/libdrm/nouveau/nouveau_pushbuf.h b/nouveau/nouveau_pushbuf.h
index c7ac8c45..c7ac8c45 100644
--- a/libdrm/nouveau/nouveau_pushbuf.h
+++ b/nouveau/nouveau_pushbuf.h
diff --git a/libdrm/nouveau/nouveau_resource.c b/nouveau/nouveau_resource.c
index 6bef7567..6bef7567 100644
--- a/libdrm/nouveau/nouveau_resource.c
+++ b/nouveau/nouveau_resource.c
diff --git a/libdrm/nouveau/nouveau_resource.h b/nouveau/nouveau_resource.h
index 988d2466..988d2466 100644
--- a/libdrm/nouveau/nouveau_resource.h
+++ b/nouveau/nouveau_resource.h
diff --git a/libdrm/radeon/Makefile.am b/radeon/Makefile.am
index 97801ead..dd136b1f 100644
--- a/libdrm/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -24,8 +24,8 @@
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
diff --git a/libdrm/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in
index 33068448..33068448 100644
--- a/libdrm/radeon/libdrm_radeon.pc.in
+++ b/radeon/libdrm_radeon.pc.in
diff --git a/libdrm/radeon/radeon_bo.h b/radeon/radeon_bo.h
index 1e2e6c20..1e2e6c20 100644
--- a/libdrm/radeon/radeon_bo.h
+++ b/radeon/radeon_bo.h
diff --git a/libdrm/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index d34f24cd..d34f24cd 100644
--- a/libdrm/radeon/radeon_bo_gem.c
+++ b/radeon/radeon_bo_gem.c
diff --git a/libdrm/radeon/radeon_bo_gem.h b/radeon/radeon_bo_gem.h
index 4a8df9ad..4a8df9ad 100644
--- a/libdrm/radeon/radeon_bo_gem.h
+++ b/radeon/radeon_bo_gem.h
diff --git a/libdrm/radeon/radeon_cs.h b/radeon/radeon_cs.h
index 1117a850..1117a850 100644
--- a/libdrm/radeon/radeon_cs.h
+++ b/radeon/radeon_cs.h
diff --git a/libdrm/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 232ea7f3..232ea7f3 100644
--- a/libdrm/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
diff --git a/libdrm/radeon/radeon_cs_gem.h b/radeon/radeon_cs_gem.h
index 5efd146f..5efd146f 100644
--- a/libdrm/radeon/radeon_cs_gem.h
+++ b/radeon/radeon_cs_gem.h
diff --git a/libdrm/radeon/radeon_cs_space.c b/radeon/radeon_cs_space.c
index 4c1ef93e..4c1ef93e 100644
--- a/libdrm/radeon/radeon_cs_space.c
+++ b/radeon/radeon_cs_space.c
diff --git a/libdrm/radeon/radeon_track.c b/radeon/radeon_track.c
index 9ab09275..9ab09275 100644
--- a/libdrm/radeon/radeon_track.c
+++ b/radeon/radeon_track.c
diff --git a/libdrm/radeon/radeon_track.h b/radeon/radeon_track.h
index 838d1f38..838d1f38 100644
--- a/libdrm/radeon/radeon_track.h
+++ b/radeon/radeon_track.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 551589f8..d044474d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,9 +2,9 @@ NULL:=#
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 \
@@ -24,7 +24,7 @@ libdrmtest_la_SOURCES = \
drmtest.h
libdrmtest_la_LIBADD = \
- $(top_builddir)/libdrm/libdrm.la \
+ $(top_builddir)/libdrm.la \
$(LIBUDEV_LIBS)
LDADD += libdrmtest.la
diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
index 64f2f603..2ae0fdc6 100644
--- a/tests/modeprint/Makefile.am
+++ b/tests/modeprint/Makefile.am
@@ -1,7 +1,7 @@
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
@@ -9,5 +9,5 @@ noinst_PROGRAMS = \
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
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 0fd59f1d..16f5e995 100644
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -1,7 +1,7 @@
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 = \
@@ -10,6 +10,6 @@ noinst_PROGRAMS = \
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)
diff --git a/libdrm/xf86drm.c b/xf86drm.c
index 26dd8129..26dd8129 100644
--- a/libdrm/xf86drm.c
+++ b/xf86drm.c
diff --git a/libdrm/xf86drm.h b/xf86drm.h
index 2cb9c9e9..2cb9c9e9 100644
--- a/libdrm/xf86drm.h
+++ b/xf86drm.h
diff --git a/libdrm/xf86drmHash.c b/xf86drmHash.c
index 82cbc2a5..82cbc2a5 100644
--- a/libdrm/xf86drmHash.c
+++ b/xf86drmHash.c
diff --git a/libdrm/xf86drmMode.c b/xf86drmMode.c
index 6d85113a..6d85113a 100644
--- a/libdrm/xf86drmMode.c
+++ b/xf86drmMode.c
diff --git a/libdrm/xf86drmMode.h b/xf86drmMode.h
index 62304bb9..62304bb9 100644
--- a/libdrm/xf86drmMode.h
+++ b/xf86drmMode.h
diff --git a/libdrm/xf86drmRandom.c b/xf86drmRandom.c
index ecab9e2d..ecab9e2d 100644
--- a/libdrm/xf86drmRandom.c
+++ b/xf86drmRandom.c
diff --git a/libdrm/xf86drmSL.c b/xf86drmSL.c
index 58aefac7..58aefac7 100644
--- a/libdrm/xf86drmSL.c
+++ b/xf86drmSL.c
diff --git a/libdrm/xf86mm.h b/xf86mm.h
index a31de424..a31de424 100644
--- a/libdrm/xf86mm.h
+++ b/xf86mm.h