58 files changed, 49 insertions, 73 deletions

diff --git a/libdrm/ChangeLog b/ChangeLog
index 1e74070..1e74070 100644
--- a/libdrm/ChangeLog
+++ b/ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 9362eba..67847f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,34 @@
 # here too, but let's just do libdrm for now
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libdrm tests
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm.pc
 
-EXTRA_DIST = libdrm.pc.in
+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 = @DRM_INCLUDES@
+
+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
diff --git a/libdrm/TODO b/TODO
index b6316a2..b6316a2 100644
--- a/libdrm/TODO
+++ b/TODO
diff --git a/configure.ac b/configure.ac
index aea56c1..58ca4e0 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
@@ -198,13 +198,12 @@ AC_SUBST(DRM_INCLUDES)
 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 f5181cb..9d3cf97 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) \
 	@DRM_INCLUDES@
 
diff --git a/libdrm/intel/intel_atomic.h b/intel/intel_atomic.h
index e725c4a..e725c4a 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 2469cd8..2469cd8 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 3801ff3..3801ff3 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 54b3cb8..54b3cb8 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 87795f3..87795f3 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 475c402..475c402 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 688476a..688476a 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 ea71cc3..ea71cc3 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 1069745..1069745 100644
--- a/libdrm/intel/mm.c
+++ b/intel/mm.c
diff --git a/libdrm/intel/mm.h b/intel/mm.h
index 8a5235b..8a5235b 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 45c6d7a..0000000
--- a/libdrm/Makefile.am
+++ b/dev/null
@@ -1,48 +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@
-libdrm_la_CPPFLAGS = @DRM_INCLUDES@
-
-AM_CFLAGS = @DRM_INCLUDES@
-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 6410f57..6410f57 100644
--- a/libdrm/libdrm_lists.h
+++ b/libdrm_lists.h
diff --git a/libdrm/nouveau/Makefile.am b/nouveau/Makefile.am
index b65e102..c44edac 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) \
 	@DRM_INCLUDES@
 
diff --git a/libdrm/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in
index 7ef49e5..7ef49e5 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 85fc14f..85fc14f 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 fdad63e..fdad63e 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 674c5c3..674c5c3 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 294f749..294f749 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 c7dda02..c7dda02 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 0982d3b..0982d3b 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 c0d9333..c0d9333 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 bc860d2..bc860d2 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 2b6e53a..2b6e53a 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 51ac7d9..51ac7d9 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 f8cfd8b..f8cfd8b 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 dbc6a3b..dbc6a3b 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 784afc9..784afc9 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 90250c0..90250c0 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 c7ac8c4..c7ac8c4 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 6bef756..6bef756 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 988d246..988d246 100644
--- a/libdrm/nouveau/nouveau_resource.h
+++ b/nouveau/nouveau_resource.h
diff --git a/libdrm/radeon/Makefile.am b/radeon/Makefile.am
index c3b6bc5..717a336 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) \
 	@DRM_INCLUDES@
 
diff --git a/libdrm/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in
index 3306844..3306844 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 1e2e6c2..1e2e6c2 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 d34f24c..d34f24c 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 4a8df9a..4a8df9a 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 1117a85..1117a85 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 232ea7f..232ea7f 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 5efd146..5efd146 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 4c1ef93..4c1ef93 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 9ab0927..9ab0927 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 838d1f3..838d1f3 100644
--- a/libdrm/radeon/radeon_track.h
+++ b/radeon/radeon_track.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 72e70f5..54cccf6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,9 +2,9 @@ NULL:=#
 
 AM_CPPFLAGS = \
 	@DRM_INCLUDES@
-	-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 3a83c43..205a9f9 100644
--- a/tests/modeprint/Makefile.am
+++ b/tests/modeprint/Makefile.am
@@ -1,7 +1,7 @@
 AM_CFLAGS = \
 	@DRM_INCLUDES@
-	-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 df5b590..893c2cd 100644
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -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 26dd812..26dd812 100644
--- a/libdrm/xf86drm.c
+++ b/xf86drm.c
diff --git a/libdrm/xf86drm.h b/xf86drm.h
index 2cb9c9e..2cb9c9e 100644
--- a/libdrm/xf86drm.h
+++ b/xf86drm.h
diff --git a/libdrm/xf86drmHash.c b/xf86drmHash.c
index 82cbc2a..82cbc2a 100644
--- a/libdrm/xf86drmHash.c
+++ b/xf86drmHash.c
diff --git a/libdrm/xf86drmMode.c b/xf86drmMode.c
index 6d85113..6d85113 100644
--- a/libdrm/xf86drmMode.c
+++ b/xf86drmMode.c
diff --git a/libdrm/xf86drmMode.h b/xf86drmMode.h
index 62304bb..62304bb 100644
--- a/libdrm/xf86drmMode.h
+++ b/xf86drmMode.h
diff --git a/libdrm/xf86drmRandom.c b/xf86drmRandom.c
index ecab9e2..ecab9e2 100644
--- a/libdrm/xf86drmRandom.c
+++ b/xf86drmRandom.c
diff --git a/libdrm/xf86drmSL.c b/xf86drmSL.c
index 58aefac..58aefac 100644
--- a/libdrm/xf86drmSL.c
+++ b/xf86drmSL.c
diff --git a/libdrm/xf86mm.h b/xf86mm.h
index a31de42..a31de42 100644
--- a/libdrm/xf86mm.h
+++ b/xf86mm.h