automake: pick up all files for distribution.

Autotools is already smart enough to pick the *.pc.in files but it
needs some help with the Android.mk ones.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>

diff --git a/Makefile.am b/Makefile.am
index 884841f..3952a88 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,7 @@ libdrm_la_SOURCES = $(LIBDRM_FILES)
 libdrmincludedir = ${includedir}
 libdrminclude_HEADERS = $(LIBDRM_H_FILES)
 
-EXTRA_DIST = libdrm.pc.in
+EXTRA_DIST = Android.mk
 
 klibdrmincludedir = ${includedir}/libdrm
 klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)

diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
index 0c7db81..4818431 100644 (file)
--- a/freedreno/Makefile.am
+++ b/freedreno/Makefile.am
@@ -21,3 +21,5 @@ libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES)
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_freedreno.pc
+
+EXTRA_DIST = Android.mk

diff --git a/intel/Makefile.am b/intel/Makefile.am
index 846695d..ca4ed84 100644 (file)
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -68,7 +68,8 @@ EXTRA_DIST = \
        $(BATCHES:.batch=.batch.sh) \
        $(BATCHES:.batch=.batch-ref.txt) \
        $(BATCHES:.batch=.batch-ref.txt) \
-       tests/test-batch.sh
+       tests/test-batch.sh \
+       Android.mk
 
 test_decode_LDADD = libdrm_intel.la ../libdrm.la
 

diff --git a/libkms/Makefile.am b/libkms/Makefile.am
index 21c65ae..4baf4fc 100644 (file)
--- a/libkms/Makefile.am
+++ b/libkms/Makefile.am
@@ -43,4 +43,4 @@ libkmsinclude_HEADERS = $(LIBKMS_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libkms.pc
 
-EXTRA_DIST = libkms.pc.in
+EXTRA_DIST = Android.mk

diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am
index a7df1ab..7543e43 100644 (file)
--- a/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -21,3 +21,5 @@ libdrm_nouveauinclude_HEADERS = $(LIBDRM_NOUVEAU_H_FILES)
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_nouveau.pc
+
+EXTRA_DIST = Android.mk

diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index aa66ca3..4575065 100644 (file)
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -45,4 +45,4 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_radeon.pc
 
-EXTRA_DIST = libdrm_radeon.pc.in
+EXTRA_DIST = Android.mk

diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index d551fe4..0a6af01 100644 (file)
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -25,3 +25,5 @@ if HAVE_CAIRO
 AM_CFLAGS += $(CAIRO_CFLAGS)
 modetest_LDADD += $(CAIRO_LIBS)
 endif
+
+EXTRA_DIST = Android.mk