Move libdrm/ up one level

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

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

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
 

libdrm/Makefile.am

@@ -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

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

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
 

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

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

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)