android: set LOCAL_MODULE_TAGS to optional

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

diff --git a/Makefile.am b/Makefile.am
index aa59101..a4d07f4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,11 +18,17 @@
 #  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.
 
-AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-nouveau-experimental-api --enable-radeon-experimental-api
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm.pc
 
+if HAVE_LIBKMS
+LIBKMS_SUBDIR = libkms
+endif
+
 if HAVE_INTEL
 INTEL_SUBDIR = intel
 endif
@@ -35,7 +41,7 @@ if HAVE_RADEON
 RADEON_SUBDIR = radeon
 endif
 
-SUBDIRS = . $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests
+SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests include
 
 libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)
@@ -50,12 +56,13 @@ libdrm_la_SOURCES =                         \
        xf86drmRandom.c                         \
        xf86drmSL.c                             \
        xf86drmMode.c                           \
+       xf86atomic.h                            \
        libdrm_lists.h
 
 libdrmincludedir = ${includedir}
 libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
 
-EXTRA_DIST = ChangeLog TODO libdrm.pc.in include/drm/*
+EXTRA_DIST = libdrm.pc.in include/drm/*
 
 copy-headers :
        cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include