Use headers copied from kernel instead of shared-core
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 17 Nov 2009 14:46:39 +0000 (09:46 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 17 Nov 2009 15:54:11 +0000 (10:54 -0500)
Makefile.am
configure.ac
libdrm/Makefile.am
libdrm/intel/Makefile.am
libdrm/nouveau/Makefile.am
libdrm/radeon/Makefile.am
tests/Makefile.am
tests/modeprint/Makefile.am
tests/modetest/Makefile.am

index 4ade045d3077d7040040076a148a19f206d94340..31b20e954c8237928c3c81d29cc8c8295aad8767 100644 (file)
 #  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
index cece9f83e9a20f553dc07124d5cd69e58c8c6ad1..971dead39f92b9ecb73922722e27523c9cad76a9 100644 (file)
@@ -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
index d13bead7477eadafe5e2377d7c0f371292d3497f..10de8e3db057c9100ca6b2d68e12f7370c6cb5c2 100644 (file)
@@ -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
 
index 0faa10dc50400f2977702018171befc9eb55b434..c3c563e4c70fe9e953e2e2c75d78b6518d22fc54 100644 (file)
@@ -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)
index 490ce571dbd0d07eb3d54b80a9e28415c714d286..db6243cc39d23b6dd0fa7f23f40b07055ec78df2 100644 (file)
@@ -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)
index bec1beb3263d966213b971f984cedf7529e0c98b..97801ead78338da59c55102063f1f9318c7484a9 100644 (file)
@@ -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)
index af44d6a30e74de4b554505263c5779bf17110711..551589f87fa49903869900428c5188a0b69cc6c5 100644 (file)
@@ -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
index 77f8ec786a2910d565b10fd3ac481445f213c2f4..64f2f60314fed12eda01150320201c3d39593c56 100644 (file)
@@ -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
 
index 860fe0643dfb8bfba3807d5a194222f956d936a4..0fd59f1d60be4879bebe16edd4c7456c2a259e03 100644 (file)
@@ -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)