aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt2008-12-17 12:41:21 -0600
committerEric Anholt2008-12-17 12:41:21 -0600
commit06ab2f6436e26f77292d53e3ce2fe547d4a79fe3 (patch)
treebe15ec3e883e05745d767aef0a853bc955f5f664
parent18f091d136cd44ab397817f8a3e89c21e9561a31 (diff)
downloadexternal-libdrm-06ab2f6436e26f77292d53e3ce2fe547d4a79fe3.tar.gz
external-libdrm-06ab2f6436e26f77292d53e3ce2fe547d4a79fe3.tar.xz
external-libdrm-06ab2f6436e26f77292d53e3ce2fe547d4a79fe3.zip
libdrm: Fix modetest/modeprint to use automake stuff.
-rw-r--r--.gitignore3
-rw-r--r--configure.ac2
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/modeprint/Makefile14
-rw-r--r--tests/modeprint/Makefile.am13
-rw-r--r--tests/modeprint/test1
-rw-r--r--tests/modetest/Makefile14
-rw-r--r--tests/modetest/Makefile.am13
-rw-r--r--tests/modetest/test2
9 files changed, 31 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore
index 796e74c3..bd78034b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,4 +65,5 @@ tests/gem_readwrite
65tests/openclose 65tests/openclose
66tests/setversion 66tests/setversion
67tests/updatedraw 67tests/updatedraw
68tests/modetest 68tests/modeprint/modeprint
69tests/modetest/modetest
diff --git a/configure.ac b/configure.ac
index f4179faa..ccc58ef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,4 +119,6 @@ AC_OUTPUT([
119 libdrm/intel/Makefile 119 libdrm/intel/Makefile
120 shared-core/Makefile 120 shared-core/Makefile
121 tests/Makefile 121 tests/Makefile
122 tests/modeprint/Makefile
123 tests/modetest/Makefile
122 libdrm.pc]) 124 libdrm.pc])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 02b2ef0a..e66d1c82 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ libdrmtest_la_LIBADD = \
15 15
16LDADD = libdrmtest.la 16LDADD = libdrmtest.la
17 17
18noinst_SUBDIRS = \ 18SUBDIRS = \
19 modeprint \ 19 modeprint \
20 modetest 20 modetest
21 21
diff --git a/tests/modeprint/Makefile b/tests/modeprint/Makefile
deleted file mode 100644
index 70788dc9..00000000
--- a/tests/modeprint/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
1
2all: app
3
4#CFLAGS = -g -ansi -pedantic -DPOSIX_C_SOURCE=199309L \
5# -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE \
6
7app: modeprint.c
8 @gcc $(CFLAGS) -o app -Wall -I../../libdrm -I../../shared-core -L../../libdrm/.libs -ldrm modeprint.c
9
10clean:
11 @rm -f app
12
13run: app
14 @sudo ./test
diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
new file mode 100644
index 00000000..77f8ec78
--- /dev/null
+++ b/tests/modeprint/Makefile.am
@@ -0,0 +1,13 @@
1AM_CFLAGS = \
2 -I$(top_srcdir)/shared-core \
3 -I$(top_srcdir)/libdrm/intel/ \
4 -I$(top_srcdir)/libdrm
5
6noinst_PROGRAMS = \
7 modeprint
8
9modeprint_SOURCES = \
10 modeprint.c
11modeprint_LDADD = \
12 $(top_builddir)/libdrm/libdrm.la \
13 $(top_builddir)/libdrm/intel/libdrm_intel.la
diff --git a/tests/modeprint/test b/tests/modeprint/test
deleted file mode 100644
index bd1952cc..00000000
--- a/tests/modeprint/test
+++ /dev/null
@@ -1 +0,0 @@
1LD_PRELOAD=../../libdrm/.libs/libdrm.so ./app $@
diff --git a/tests/modetest/Makefile b/tests/modetest/Makefile
deleted file mode 100644
index 8583ae82..00000000
--- a/tests/modetest/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
1
2all: app
3
4#CFLAGS = -g -ansi -pedantic -DPOSIX_C_SOURCE=199309L \
5# -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE \
6
7app: modetest.c
8 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
9
10clean:
11 @rm -f app
12
13run: app
14 sudo ./test
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
new file mode 100644
index 00000000..b89c489e
--- /dev/null
+++ b/tests/modetest/Makefile.am
@@ -0,0 +1,13 @@
1AM_CFLAGS = \
2 -I$(top_srcdir)/shared-core \
3 -I$(top_srcdir)/libdrm/intel/ \
4 -I$(top_srcdir)/libdrm
5
6noinst_PROGRAMS = \
7 modetest
8
9modetest_SOURCES = \
10 modetest.c
11modetest_LDADD = \
12 $(top_builddir)/libdrm/libdrm.la \
13 $(top_builddir)/libdrm/intel/libdrm_intel.la
diff --git a/tests/modetest/test b/tests/modetest/test
deleted file mode 100644
index 5bb552ef..00000000
--- a/tests/modetest/test
+++ /dev/null
@@ -1,2 +0,0 @@
1export LD_LIBRARY_PATH=../../libdrm/.libs:../../libdrm/intel/.libs
2LD_PRELOAD=../../libdrm/.libs/libdrm.so ./app $@