aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk8
-rw-r--r--Makefile.am10
-rw-r--r--Makefile.sources19
-rw-r--r--configure.ac2
-rw-r--r--include/Makefile.am1
-rw-r--r--include/drm/Makefile.am32
-rw-r--r--include/drm/Makefile.sources18
7 files changed, 31 insertions, 59 deletions
diff --git a/Android.mk b/Android.mk
index bb49b0b0..97a7d751 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,10 +26,8 @@ include $(CLEAR_VARS)
26 26
27LIBDRM_TOP := $(LOCAL_PATH) 27LIBDRM_TOP := $(LOCAL_PATH)
28 28
29# Import variables LIBDRM_FILES, LIBDRM_H_FILES 29# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
30include $(LOCAL_PATH)/Makefile.sources 30include $(LOCAL_PATH)/Makefile.sources
31# Import variables LIBDRM_INCLUDE_H_FILES, LIBDRM_INCLUDE_VMWGFX_H_FILES
32include $(LOCAL_PATH)/include/drm/Makefile.sources
33 31
34LOCAL_MODULE := libdrm 32LOCAL_MODULE := libdrm
35LOCAL_MODULE_TAGS := optional 33LOCAL_MODULE_TAGS := optional
@@ -47,8 +45,8 @@ LOCAL_CFLAGS := \
47 45
48LOCAL_COPY_HEADERS := \ 46LOCAL_COPY_HEADERS := \
49 $(LIBDRM_H_FILES) \ 47 $(LIBDRM_H_FILES) \
50 $(addprefix include/drm/,$(LIBDRM_INCLUDE_H_FILES)) \ 48 $(LIBDRM_INCLUDE_H_FILES) \
51 $(addprefix include/drm/,$(LIBDRM_INCLUDE_VMWGFX_H_FILES)) 49 $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
52 50
53LOCAL_COPY_HEADERS_TO := libdrm 51LOCAL_COPY_HEADERS_TO := libdrm
54include $(BUILD_SHARED_LIBRARY) 52include $(BUILD_SHARED_LIBRARY)
diff --git a/Makefile.am b/Makefile.am
index fab2a9a6..083861f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@ if HAVE_FREEDRENO
53FREEDRENO_SUBDIR = freedreno 53FREEDRENO_SUBDIR = freedreno
54endif 54endif
55 55
56SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) tests include man 56SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) tests man
57 57
58libdrm_la_LTLIBRARIES = libdrm.la 58libdrm_la_LTLIBRARIES = libdrm.la
59libdrm_ladir = $(libdir) 59libdrm_ladir = $(libdir)
@@ -71,6 +71,14 @@ libdrminclude_HEADERS = $(LIBDRM_H_FILES)
71 71
72EXTRA_DIST = libdrm.pc.in include/drm/* 72EXTRA_DIST = libdrm.pc.in include/drm/*
73 73
74klibdrmincludedir = ${includedir}/libdrm
75klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)
76
77if HAVE_VMWGFX
78klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
79endif
80
81
74copy-headers : 82copy-headers :
75 cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include 83 cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include
76 84
diff --git a/Makefile.sources b/Makefile.sources
index d078ca9c..d86fb2ae 100644
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -11,3 +11,22 @@ LIBDRM_FILES := \
11LIBDRM_H_FILES := \ 11LIBDRM_H_FILES := \
12 xf86drm.h \ 12 xf86drm.h \
13 xf86drmMode.h 13 xf86drmMode.h
14
15LIBDRM_INCLUDE_H_FILES := \
16 include/drm/drm.h \
17 include/drm/drm_fourcc.h \
18 include/drm/drm_mode.h \
19 include/drm/drm_sarea.h \
20 include/drm/i915_drm.h \
21 include/drm/mach64_drm.h \
22 include/drm/mga_drm.h \
23 include/drm/nouveau_drm.h \
24 include/drm/qxl_drm.h \
25 include/drm/r128_drm.h \
26 include/drm/radeon_drm.h \
27 include/drm/savage_drm.h \
28 include/drm/sis_drm.h \
29 include/drm/via_drm.h
30
31LIBDRM_INCLUDE_VMWGFX_H_FILES := \
32 include/drm/vmwgfx_drm.h
diff --git a/configure.ac b/configure.ac
index bb0559a1..16625a5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,8 +410,6 @@ AC_CONFIG_FILES([
410 tests/radeon/Makefile 410 tests/radeon/Makefile
411 tests/vbltest/Makefile 411 tests/vbltest/Makefile
412 tests/exynos/Makefile 412 tests/exynos/Makefile
413 include/Makefile
414 include/drm/Makefile
415 man/Makefile 413 man/Makefile
416 libdrm.pc]) 414 libdrm.pc])
417AC_OUTPUT 415AC_OUTPUT
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 55ea5066..00000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
1SUBDIRS = drm
diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am
deleted file mode 100644
index 7a246aee..00000000
--- a/include/drm/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
1# Copyright 2005 Adam Jackson.
2#
3# Permission is hereby granted, free of charge, to any person obtaining a
4# copy of this software and associated documentation files (the "Software"),
5# to deal in the Software without restriction, including without limitation
6# on the rights to use, copy, modify, merge, publish, distribute, sub
7# license, and/or sell copies of the Software, and to permit persons to whom
8# the Software is furnished to do so, subject to the following conditions:
9#
10# The above copyright notice and this permission notice (including the next
11# paragraph) shall be included in all copies or substantial portions of the
12# Software.
13#
14# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
17# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
18# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
19# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20
21# XXX airlied says, nothing besides *_drm.h and drm*.h should be necessary.
22# however, r300 and via need their reg headers installed in order to build.
23# better solutions are welcome.
24
25include Makefile.sources
26
27klibdrmincludedir = ${includedir}/libdrm
28klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)
29
30if HAVE_VMWGFX
31klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
32endif
diff --git a/include/drm/Makefile.sources b/include/drm/Makefile.sources
deleted file mode 100644
index 8e1b5854..00000000
--- a/include/drm/Makefile.sources
+++ /dev/null
@@ -1,18 +0,0 @@
1LIBDRM_INCLUDE_H_FILES := \
2 drm.h \
3 drm_mode.h \
4 drm_fourcc.h \
5 drm_sarea.h \
6 i915_drm.h \
7 mga_drm.h \
8 nouveau_drm.h \
9 r128_drm.h \
10 radeon_drm.h \
11 savage_drm.h \
12 sis_drm.h \
13 via_drm.h \
14 mach64_drm.h \
15 qxl_drm.h
16
17LIBDRM_INCLUDE_VMWGFX_H_FILES := \
18 vmwgfx_drm.h