3 files changed, 15 insertions, 50 deletions
diff --git a/src/egl/wayland/wayland-drm/.gitignore b/src/egl/wayland/wayland-drm/.gitignore
deleted file mode 100644
index f4ed848476f..00000000000
--- a/src/egl/wayland/wayland-drm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-wayland-drm-client-protocol.h
-wayland-drm-server-protocol.h
-wayland-drm-protocol.c
diff --git a/src/egl/wayland/wayland-drm/Makefile b/src/egl/wayland/wayland-drm/Makefile
deleted file mode 100644
index 42222a9872c..00000000000
--- a/src/egl/wayland/wayland-drm/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# src/egl/wayland/wayland-drm/Makefile
-
-TOP = ../../../..
-include $(TOP)/configs/current
-
-GEN_SOURCES = wayland-drm-protocol.c
-
-GEN_HEADERS = wayland-drm-client-protocol.h wayland-drm-server-protocol.h
-
-wayland_drm_SOURCES = wayland-drm.c $(GEN_SOURCES)
-wayland_drm_OBJECTS = $(wayland_drm_SOURCES:.c=.o)
-
-wayland_drm_INCLUDES = \
-		$(WAYLAND_CFLAGS) \
-		-I$(TOP)/src/egl/main \
-		-I$(TOP)/include
-
-# Generate protocol sources
-prefix=$(shell $(PKG_CONFIG) --variable=prefix wayland-server)
-exec_prefx=$(shell $(PKG_CONFIG) --variable=exec_prefix wayland-server)
-wayland_protocoldir = $(PWD)/protocol
-wayland_scanner=$(exec_prefix)/bin/wayland-scanner
-
-default: depend libwayland-drm.a $(GEN_SOURCES) $(GEN_HEADERS)
-
-libwayland-drm.a: $(wayland_drm_OBJECTS) Makefile
-	$(MKLIB) -o wayland-drm -static $(wayland_drm_OBJECTS)
- 
-depend: 
-	rm -f depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(wayland_drm_INCLUDES) $(wayland_drm_SOURCES) 2> /dev/null
-
-clean:
-	rm -rf libwayland-drm.a $(wayland_drm_OBJECTS) \
-		$(GEN_SOURCES) $(GEN_HEADERS)
-	rm -f depend depend.bak
-
-install:
-	@echo -n ""
-
-$(wayland_drm_OBJECTS): %.o: %.c $(GEN_HEADERS)
-	$(CC) -c $(wayland_drm_INCLUDES) $(CFLAGS) $< -o $@
-
-include $(prefix)/share/aclocal/wayland-scanner.mk
-
-sinclude depend
diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am
new file mode 100644
index 00000000000..cf15edae83d
--- /dev/null
+++ b/src/egl/wayland/wayland-drm/Makefile.am
@@ -0,0 +1,15 @@
+AM_CFLAGS = -I$(top_srcdir)/src/egl/main \
+	    -I$(top_srcdir)/include \
+	    $(DEFINES) \
+	    $(WAYLAND_CFLAGS) 
+
+noinst_LTLIBRARIES = libwayland-drm.la
+libwayland_drm_la_SOURCES = wayland-drm.c wayland-drm-protocol.c
+noinst_HEADERS = wayland-drm.h
+
+BUILT_SOURCES = wayland-drm-protocol.c \
+		wayland-drm-client-protocol.h \
+		wayland-drm-server-protocol.h
+CLEANFILES = $(BUILT_SOURCES)
+
+@wayland_scanner_rules@