X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Makefile.am;h=a4d07f426af65b3f7def31e7f8723ee4be2208ce;hb=refs%2Fheads%2Ffroyo-x86;hp=41e5a3423a7bd5aae4ff592e24ae2ee0d67b2680;hpb=3bd834a2178ee1273fd84628e87210a500f8fc84;p=android-x86%2Fexternal-libdrm.git

diff --git a/Makefile.am b/Makefile.am
index 41e5a342..a4d07f42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,13 +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
@@ -37,7 +41,7 @@ if HAVE_RADEON
 RADEON_SUBDIR = radeon
 endif
 
-SUBDIRS = . $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests include
+SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests include
 
 libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)
@@ -52,6 +56,7 @@ libdrm_la_SOURCES =				\
 	xf86drmRandom.c				\
 	xf86drmSL.c				\
 	xf86drmMode.c				\
+	xf86atomic.h				\
 	libdrm_lists.h
 
 libdrmincludedir = ${includedir}