diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/modeprint/Makefile | 14 | ||||
| -rw-r--r-- | tests/modeprint/Makefile.am | 13 | ||||
| -rw-r--r-- | tests/modeprint/test | 1 | ||||
| -rw-r--r-- | tests/modetest/Makefile | 14 | ||||
| -rw-r--r-- | tests/modetest/Makefile.am | 13 | ||||
| -rw-r--r-- | tests/modetest/test | 2 |
9 files changed, 31 insertions, 33 deletions
@@ -65,4 +65,5 @@ tests/gem_readwrite tests/openclose tests/setversion tests/updatedraw -tests/modetest +tests/modeprint/modeprint +tests/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([ libdrm/intel/Makefile shared-core/Makefile tests/Makefile + tests/modeprint/Makefile + tests/modetest/Makefile 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 = \ LDADD = libdrmtest.la -noinst_SUBDIRS = \ +SUBDIRS = \ modeprint \ modetest 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 @@ - -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 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 @@ +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 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 @@ -LD_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 @@ - -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 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 @@ +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 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 @@ -export LD_LIBRARY_PATH=../../libdrm/.libs:../../libdrm/intel/.libs -LD_PRELOAD=../../libdrm/.libs/libdrm.so ./app $@ |