summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2009-11-17 09:46:39 -0500
committerKristian Høgsberg <krh@bitplanet.net>2009-11-17 10:54:11 -0500
commita66cf9ce68bdf9bd887f91a38ced4b59c129b3c7 (patch)
treed7de6cf38dc916535b0a922c6356029fe23e61b4
parentba79b1a8c2ea354c89371b5e34e0077f6ecaaa63 (diff)
Use headers copied from kernel instead of shared-core
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac1
-rw-r--r--libdrm/Makefile.am2
-rw-r--r--libdrm/intel/Makefile.am2
-rw-r--r--libdrm/nouveau/Makefile.am2
-rw-r--r--libdrm/radeon/Makefile.am2
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/modeprint/Makefile.am2
-rw-r--r--tests/modetest/Makefile.am2
9 files changed, 8 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index 4ade045d..31b20e95 100644
--- 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 cece9f83..971dead3 100644
--- 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 d13bead7..10de8e3d 100644
--- 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 0faa10dc..c3c563e4 100644
--- 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 490ce571..db6243cc 100644
--- 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 bec1beb3..97801ead 100644
--- 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 af44d6a3..551589f8 100644
--- 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 77f8ec78..64f2f603 100644
--- 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 860fe064..0fd59f1d 100644
--- 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)