libdrm: Fix modetest/modeprint to use automake stuff.

.gitignore

@@ -65,4 +65,5 @@ tests/gem_readwrite
 tests/openclose
 tests/setversion
 tests/updatedraw
-tests/modetest
+tests/modeprint/modeprint
+tests/modetest/modetest

configure.ac

@@ -119,4 +119,6 @@ AC_OUTPUT([
 	libdrm/intel/Makefile
 	shared-core/Makefile
 	tests/Makefile
+	tests/modeprint/Makefile
+	tests/modetest/Makefile
 	libdrm.pc])

tests/Makefile.am

@@ -15,7 +15,7 @@ libdrmtest_la_LIBADD = \
 
 LDADD = libdrmtest.la
 
-noinst_SUBDIRS = \
+SUBDIRS = \
 	modeprint \
 	modetest
 

tests/modeprint/Makefile

@@ -1,14 +0,0 @@
-
-all: app
-
-#CFLAGS = -g -ansi -pedantic -DPOSIX_C_SOURCE=199309L \
-#        -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE \
-
-app: modeprint.c
-	@gcc $(CFLAGS) -o app -Wall -I../../libdrm -I../../shared-core -L../../libdrm/.libs -ldrm modeprint.c
-
-clean:
-	@rm -f app
-
-run: app
-	@sudo ./test

tests/modeprint/Makefile.am

@@ -0,0 +1,13 @@
+AM_CFLAGS = \
+	-I$(top_srcdir)/shared-core \
+	-I$(top_srcdir)/libdrm/intel/ \
+	-I$(top_srcdir)/libdrm
+
+noinst_PROGRAMS = \
+	modeprint
+
+modeprint_SOURCES = \
+	modeprint.c
+modeprint_LDADD = \
+	$(top_builddir)/libdrm/libdrm.la \
+	$(top_builddir)/libdrm/intel/libdrm_intel.la

tests/modeprint/test

@@ -1 +0,0 @@
-LD_PRELOAD=../../libdrm/.libs/libdrm.so ./app $@

tests/modetest/Makefile

@@ -1,14 +0,0 @@
-
-all: app
-
-#CFLAGS = -g -ansi -pedantic -DPOSIX_C_SOURCE=199309L \
-#        -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE \
-
-app: modetest.c
-	gcc $(CFLAGS) -o app -Wall -I../../libdrm -I../../libdrm/intel -I../../shared-core -L../../libdrm/.libs -L../../libdrm/intel/.libs -ldrm -ldrm_intel modetest.c
-
-clean:
-	@rm -f app
-
-run: app
-	sudo ./test

tests/modetest/Makefile.am

@@ -0,0 +1,13 @@
+AM_CFLAGS = \
+	-I$(top_srcdir)/shared-core \
+	-I$(top_srcdir)/libdrm/intel/ \
+	-I$(top_srcdir)/libdrm
+
+noinst_PROGRAMS = \
+	modetest
+
+modetest_SOURCES = \
+	modetest.c
+modetest_LDADD = \
+	$(top_builddir)/libdrm/libdrm.la \
+	$(top_builddir)/libdrm/intel/libdrm_intel.la

tests/modetest/test

@@ -1,2 +0,0 @@
-export LD_LIBRARY_PATH=../../libdrm/.libs:../../libdrm/intel/.libs
-LD_PRELOAD=../../libdrm/.libs/libdrm.so ./app $@