From 4f57abfe66091281c9f59c14e6ea27b524b55d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 17 Nov 2009 11:14:54 -0500 Subject: Move libdrm/ up one level --- tests/Makefile.am | 6 +++--- tests/modeprint/Makefile.am | 8 ++++---- tests/modetest/Makefile.am | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 551589f8..d044474d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,9 +2,9 @@ NULL:=# AM_CPPFLAGS = \ -I $(top_srcdir)/include/drm \ - -I $(top_srcdir)/libdrm + -I $(top_srcdir) -LDADD = $(top_builddir)/libdrm/libdrm.la +LDADD = $(top_builddir)/libdrm.la noinst_PROGRAMS = \ dristat \ @@ -24,7 +24,7 @@ libdrmtest_la_SOURCES = \ drmtest.h libdrmtest_la_LIBADD = \ - $(top_builddir)/libdrm/libdrm.la \ + $(top_builddir)/libdrm.la \ $(LIBUDEV_LIBS) LDADD += libdrmtest.la diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am index 64f2f603..2ae0fdc6 100644 --- a/tests/modeprint/Makefile.am +++ b/tests/modeprint/Makefile.am @@ -1,7 +1,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/include/drm \ - -I$(top_srcdir)/libdrm/intel/ \ - -I$(top_srcdir)/libdrm + -I$(top_srcdir)/intel/ \ + -I$(top_srcdir) noinst_PROGRAMS = \ modeprint @@ -9,5 +9,5 @@ noinst_PROGRAMS = \ modeprint_SOURCES = \ modeprint.c modeprint_LDADD = \ - $(top_builddir)/libdrm/libdrm.la \ - $(top_builddir)/libdrm/intel/libdrm_intel.la + $(top_builddir)/libdrm.la \ + $(top_builddir)/intel/libdrm_intel.la diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am index 0fd59f1d..16f5e995 100644 --- a/tests/modetest/Makefile.am +++ b/tests/modetest/Makefile.am @@ -1,7 +1,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/include/drm \ - -I$(top_srcdir)/libdrm/intel/ \ - -I$(top_srcdir)/libdrm \ + -I$(top_srcdir)/intel/ \ + -I$(top_srcdir) \ $(CAIRO_CFLAGS) noinst_PROGRAMS = \ @@ -10,6 +10,6 @@ noinst_PROGRAMS = \ modetest_SOURCES = \ modetest.c modetest_LDADD = \ - $(top_builddir)/libdrm/libdrm.la \ - $(top_builddir)/libdrm/intel/libdrm_intel.la \ + $(top_builddir)/libdrm.la \ + $(top_builddir)/intel/libdrm_intel.la \ $(CAIRO_LIBS) -- cgit v1.2.3