aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--freedreno/Makefile.am2
-rw-r--r--intel/Makefile.am1
-rw-r--r--libkms/Makefile.am2
-rw-r--r--nouveau/Makefile.am2
-rw-r--r--radeon/Makefile.am2
-rw-r--r--tests/modetest/Makefile.am2
7 files changed, 4 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index feecba72..2ceb3526 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,8 +120,6 @@ libdrm_la_SOURCES = $(LIBDRM_FILES)
120libdrmincludedir = ${includedir} 120libdrmincludedir = ${includedir}
121libdrminclude_HEADERS = $(LIBDRM_H_FILES) 121libdrminclude_HEADERS = $(LIBDRM_H_FILES)
122 122
123EXTRA_DIST = Android.mk
124
125klibdrmincludedir = ${includedir}/libdrm 123klibdrmincludedir = ${includedir}/libdrm
126klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES) 124klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)
127 125
diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
index 9b7ec7df..0771d146 100644
--- a/freedreno/Makefile.am
+++ b/freedreno/Makefile.am
@@ -27,4 +27,4 @@ pkgconfigdir = @pkgconfigdir@
27pkgconfig_DATA = libdrm_freedreno.pc 27pkgconfig_DATA = libdrm_freedreno.pc
28 28
29TESTS = freedreno-symbol-check 29TESTS = freedreno-symbol-check
30EXTRA_DIST = Android.mk $(TESTS) 30EXTRA_DIST = $(TESTS)
diff --git a/intel/Makefile.am b/intel/Makefile.am
index d0045684..c52e8c08 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -66,7 +66,6 @@ EXTRA_DIST = \
66 $(BATCHES:.batch=.batch-ref.txt) \ 66 $(BATCHES:.batch=.batch-ref.txt) \
67 $(BATCHES:.batch=.batch-ref.txt) \ 67 $(BATCHES:.batch=.batch-ref.txt) \
68 tests/test-batch.sh \ 68 tests/test-batch.sh \
69 Android.mk \
70 $(TESTS) 69 $(TESTS)
71 70
72test_decode_LDADD = libdrm_intel.la ../libdrm.la 71test_decode_LDADD = libdrm_intel.la ../libdrm.la
diff --git a/libkms/Makefile.am b/libkms/Makefile.am
index 6c0ab7a2..7c1debe2 100644
--- a/libkms/Makefile.am
+++ b/libkms/Makefile.am
@@ -44,4 +44,4 @@ pkgconfigdir = @pkgconfigdir@
44pkgconfig_DATA = libkms.pc 44pkgconfig_DATA = libkms.pc
45 45
46TESTS = kms-symbol-check 46TESTS = kms-symbol-check
47EXTRA_DIST = Android.mk $(TESTS) 47EXTRA_DIST = $(TESTS)
diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am
index 76cdecad..344a8445 100644
--- a/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -30,4 +30,4 @@ pkgconfigdir = @pkgconfigdir@
30pkgconfig_DATA = libdrm_nouveau.pc 30pkgconfig_DATA = libdrm_nouveau.pc
31 31
32TESTS = nouveau-symbol-check 32TESTS = nouveau-symbol-check
33EXTRA_DIST = Android.mk $(TESTS) 33EXTRA_DIST = $(TESTS)
diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index 31f19e5f..e2415314 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -44,4 +44,4 @@ pkgconfigdir = @pkgconfigdir@
44pkgconfig_DATA = libdrm_radeon.pc 44pkgconfig_DATA = libdrm_radeon.pc
45 45
46TESTS = radeon-symbol-check 46TESTS = radeon-symbol-check
47EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES) $(TESTS) 47EXTRA_DIST = $(LIBDRM_RADEON_BOF_FILES) $(TESTS)
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 25ce372f..9686ccb9 100644
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -22,5 +22,3 @@ modetest_LDADD = \
22 $(top_builddir)/tests/util/libutil.la \ 22 $(top_builddir)/tests/util/libutil.la \
23 $(CAIRO_LIBS) \ 23 $(CAIRO_LIBS) \
24 -lpthread 24 -lpthread
25
26EXTRA_DIST = Android.mk