Use headers copied from kernel instead of shared-core

diff --git a/Makefile.am b/Makefile.am
index 4ade045..31b20e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,11 +18,8 @@
 #  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.
 
-# eventually someone might want to build the kernel modules or tests from 
-# here too, but let's just do libdrm for now
-
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libdrm shared-core tests
+SUBDIRS = libdrm tests
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm.pc

diff --git a/configure.ac b/configure.ac
index cece9f8..971dead 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -204,7 +204,6 @@ AC_OUTPUT([
        libdrm/radeon/libdrm_radeon.pc
        libdrm/nouveau/Makefile
        libdrm/nouveau/libdrm_nouveau.pc
-       shared-core/Makefile
        tests/Makefile
        tests/modeprint/Makefile
        tests/modetest/Makefile

diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index d13bead..10de8e3 100644 (file)
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -37,7 +37,7 @@ libdrm_ladir = $(libdir)
 libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
 libdrm_la_LIBADD = @CLOCK_LIB@
 
-AM_CFLAGS = -I$(top_srcdir)/shared-core
+AM_CFLAGS = -I$(top_srcdir)/include/drm
 libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
        xf86drmMode.c libdrm_lists.h
 

diff --git a/libdrm/intel/Makefile.am b/libdrm/intel/Makefile.am
index 0faa10d..c3c563e 100644 (file)
--- a/libdrm/intel/Makefile.am
+++ b/libdrm/intel/Makefile.am
@@ -27,7 +27,7 @@ AM_CFLAGS = \
        -I$(top_srcdir)/libdrm \
        -I$(top_srcdir)/libdrm/intel \
        $(PTHREADSTUBS_CFLAGS) \
-       -I$(top_srcdir)/shared-core
+       -I$(top_srcdir)/include/drm
 
 libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
 libdrm_intel_ladir = $(libdir)

diff --git a/libdrm/nouveau/Makefile.am b/libdrm/nouveau/Makefile.am
index 490ce57..db6243c 100644 (file)
--- a/libdrm/nouveau/Makefile.am
+++ b/libdrm/nouveau/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = \
        -I$(top_srcdir)/libdrm \
        -I$(top_srcdir)/libdrm/nouveau \
        $(PTHREADSTUBS_CFLAGS) \
-       -I$(top_srcdir)/shared-core
+       -I$(top_srcdir)/include/drm
 
 libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
 libdrm_nouveau_ladir = $(libdir)

diff --git a/libdrm/radeon/Makefile.am b/libdrm/radeon/Makefile.am
index bec1beb..97801ea 100644 (file)
--- a/libdrm/radeon/Makefile.am
+++ b/libdrm/radeon/Makefile.am
@@ -27,7 +27,7 @@ AM_CFLAGS = \
        -I$(top_srcdir)/libdrm \
        -I$(top_srcdir)/libdrm/radeon \
        $(PTHREADSTUBS_CFLAGS) \
-       -I$(top_srcdir)/shared-core
+       -I$(top_srcdir)/include/drm
 
 libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
 libdrm_radeon_ladir = $(libdir)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index af44d6a..551589f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 NULL:=#
 
 AM_CPPFLAGS = \
-       -I $(top_srcdir)/shared-core \
+       -I $(top_srcdir)/include/drm \
        -I $(top_srcdir)/libdrm
 
 LDADD = $(top_builddir)/libdrm/libdrm.la

diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
index 77f8ec7..64f2f60 100644 (file)
--- a/tests/modeprint/Makefile.am
+++ b/tests/modeprint/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = \
-       -I$(top_srcdir)/shared-core \
+       -I$(top_srcdir)/include/drm \
        -I$(top_srcdir)/libdrm/intel/ \
        -I$(top_srcdir)/libdrm
 

diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 860fe06..0fd59f1 100644 (file)
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = \
-       -I$(top_srcdir)/shared-core \
+       -I$(top_srcdir)/include/drm \
        -I$(top_srcdir)/libdrm/intel/ \
        -I$(top_srcdir)/libdrm \
        $(CAIRO_CFLAGS)