From a5446775f27b52c120c75b8f82656aa64f93319d Mon Sep 17 00:00:00 2001 From: Andreas Boll Date: Thu, 21 Jul 2016 12:05:03 +0200 Subject: automake: Don't include Android Makefiles in the release tarball Currently only some Android Makefiles are included in the release tarball. To be more consistent one could either add the remaining files or don't ship Android Makefiles altogether. According to Emil the Android folk doesn't use our release tarballs. Thus it makes sense to remove those files from distribution which also means less work for maintenance in the future. Suggested-by: Emil Velikov Signed-off-by: Andreas Boll Reviewed-by: Emil Velikov --- Makefile.am | 2 -- freedreno/Makefile.am | 2 +- intel/Makefile.am | 1 - libkms/Makefile.am | 2 +- nouveau/Makefile.am | 2 +- radeon/Makefile.am | 2 +- tests/modetest/Makefile.am | 2 -- 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) libdrmincludedir = ${includedir} libdrminclude_HEADERS = $(LIBDRM_H_FILES) -EXTRA_DIST = Android.mk - klibdrmincludedir = ${includedir}/libdrm klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES) 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@ pkgconfig_DATA = libdrm_freedreno.pc TESTS = freedreno-symbol-check -EXTRA_DIST = Android.mk $(TESTS) +EXTRA_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 = \ $(BATCHES:.batch=.batch-ref.txt) \ $(BATCHES:.batch=.batch-ref.txt) \ tests/test-batch.sh \ - Android.mk \ $(TESTS) test_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@ pkgconfig_DATA = libkms.pc TESTS = kms-symbol-check -EXTRA_DIST = Android.mk $(TESTS) +EXTRA_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@ pkgconfig_DATA = libdrm_nouveau.pc TESTS = nouveau-symbol-check -EXTRA_DIST = Android.mk $(TESTS) +EXTRA_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@ pkgconfig_DATA = libdrm_radeon.pc TESTS = radeon-symbol-check -EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES) $(TESTS) +EXTRA_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 = \ $(top_builddir)/tests/util/libutil.la \ $(CAIRO_LIBS) \ -lpthread - -EXTRA_DIST = Android.mk -- cgit v1.2.3