2010-10-22 03:30:26 +02:00
|
|
|
diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
|
|
|
|
|
--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
|
|
|
|
|
+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
|
2011-08-12 11:16:33 +02:00
|
|
|
@@ -47,10 +47,6 @@
|
|
|
|
|
LT_INIT([disable-static])
|
|
|
|
|
|
2010-10-22 03:30:26 +02:00
|
|
|
|
|
|
|
|
-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
|
|
|
|
|
-AC_SUBST(PTHREADSTUBS_CFLAGS)
|
|
|
|
|
-AC_SUBST(PTHREADSTUBS_LIBS)
|
|
|
|
|
-
|
2011-08-12 11:16:33 +02:00
|
|
|
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
|
|
|
|
|
AC_SUBST(PCIACCESS_CFLAGS)
|
|
|
|
|
AC_SUBST(PCIACCESS_LIBS)
|
2010-10-22 03:30:26 +02:00
|
|
|
--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
|
|
|
|
|
+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
|
2011-08-12 11:16:33 +02:00
|
|
|
@@ -26,14 +26,13 @@
|
2010-10-22 03:30:26 +02:00
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
-I$(top_srcdir)/intel \
|
|
|
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
2011-08-12 11:16:33 +02:00
|
|
|
$(PCIACCESS_CFLAGS) \
|
2010-10-22 03:30:26 +02:00
|
|
|
-I$(top_srcdir)/include/drm
|
|
|
|
|
|
|
|
|
|
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
|
|
|
|
|
libdrm_intel_ladir = $(libdir)
|
|
|
|
|
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
2011-08-12 11:16:33 +02:00
|
|
|
-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
|
|
|
|
|
+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
|
2010-10-22 03:30:26 +02:00
|
|
|
|
|
|
|
|
libdrm_intel_la_SOURCES = \
|
2011-08-12 11:16:33 +02:00
|
|
|
intel_bufmgr.c \
|
2010-10-22 03:30:26 +02:00
|
|
|
--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
|
|
|
|
|
+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
|
|
|
|
|
@@ -26,13 +26,12 @@
|
|
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
-I$(top_srcdir)/radeon \
|
|
|
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
|
|
|
|
-I$(top_srcdir)/include/drm
|
|
|
|
|
|
|
|
|
|
libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
|
|
|
|
|
libdrm_radeon_ladir = $(libdir)
|
|
|
|
|
libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
|
|
|
|
-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
|
|
|
|
|
+libdrm_radeon_la_LIBADD = ../libdrm.la
|
|
|
|
|
|
|
|
|
|
libdrm_radeon_la_SOURCES = \
|
|
|
|
|
radeon_bo_gem.c \
|
|
|
|
|
--- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000
|
|
|
|
|
+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000
|
|
|
|
|
@@ -2,13 +2,12 @@
|
|
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
-I$(top_srcdir)/nouveau \
|
|
|
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
|
|
|
|
-I$(top_srcdir)/include/drm
|
|
|
|
|
|
|
|
|
|
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
|
|
|
|
|
libdrm_nouveau_ladir = $(libdir)
|
|
|
|
|
libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
|
|
|
|
-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
|
|
|
|
|
+libdrm_nouveau_la_LIBADD = ../libdrm.la
|
|
|
|
|
|
|
|
|
|
libdrm_nouveau_la_SOURCES = \
|
|
|
|
|
nouveau_device.c \
|
