Don't use DRM_BO_FLAG_NO_MOVE in bufmgr fake. It's a ttm flag.

[android-x86/external-libdrm.git] / libdrm / Makefile.am

diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index f5fa69b..a568aac 100644 (file)
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -18,41 +18,19 @@
 #  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.
 
+SUBDIRS = . intel
+
 libdrm_la_LTLIBRARIES = libdrm.la
-libdrm_ladir = /lib
-libdrm_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+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
-libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
+libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
+       xf86drmMode.c libdrm_lists.h
+       libdrm_lists.h
 
 libdrmincludedir = ${includedir}
-libdrminclude_HEADERS = xf86drm.h
+libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
 
-klibdrmincludedir = ${includedir}/drm
-klibdrminclude_HEADERS = \
-                         ../shared-core/drm.h \
-                         ../shared-core/drm_sarea.h \
-                         ../shared-core/i915_drm.h \
-                         ../shared-core/i915_drv.h \
-                         ../shared-core/imagine_drv.h \
-                         ../shared-core/mach64_drm.h \
-                         ../shared-core/mach64_drv.h \
-                         ../shared-core/mga_drm.h \
-                         ../shared-core/mga_drv.h \
-                         ../shared-core/mga_ucode.h \
-                         ../shared-core/r128_drm.h \
-                         ../shared-core/r128_drv.h \
-                         ../shared-core/radeon_drm.h \
-                         ../shared-core/radeon_drv.h \
-                         ../shared-core/savage_drm.h \
-                         ../shared-core/savage_drv.h \
-                         ../shared-core/sis_drm.h \
-                         ../shared-core/sis_drv.h \
-                         ../shared-core/sis_ds.h \
-                         ../shared-core/tdfx_drv.h \
-                         ../shared-core/via_3d_reg.h \
-                         ../shared-core/via_drm.h \
-                         ../shared-core/via_drv.h \
-                         ../shared-core/via_ds.h \
-                         ../shared-core/via_mm.h \
-                         ../shared-core/via_verifier.h
+EXTRA_DIST = ChangeLog TODO