geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use headers copied from kernel instead of shared-core

main
Kristian Høgsberg 2009-11-17 09:46:39 -05:00
parent ba79b1a8c2
commit a66cf9ce68
9 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -18,11 +18,8 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# eventually someone might want to build the kernel modules or tests from
# here too, but let's just do libdrm for now
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
SUBDIRS = libdrm shared-core tests SUBDIRS = libdrm tests
pkgconfigdir = @pkgconfigdir@ pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm.pc pkgconfig_DATA = libdrm.pc

1
configure.ac
View File

@ -204,7 +204,6 @@ AC_OUTPUT([
libdrm/radeon/libdrm_radeon.pc libdrm/radeon/libdrm_radeon.pc
libdrm/nouveau/Makefile libdrm/nouveau/Makefile
libdrm/nouveau/libdrm_nouveau.pc libdrm/nouveau/libdrm_nouveau.pc
shared-core/Makefile
tests/Makefile tests/Makefile
tests/modeprint/Makefile tests/modeprint/Makefile
tests/modetest/Makefile tests/modetest/Makefile

2
libdrm/Makefile.am
View File

@ -37,7 +37,7 @@ libdrm_ladir = $(libdir)
libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
libdrm_la_LIBADD = @CLOCK_LIB@ libdrm_la_LIBADD = @CLOCK_LIB@
AM_CFLAGS = -I$(top_srcdir)/shared-core AM_CFLAGS = -I$(top_srcdir)/include/drm
libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \ libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
xf86drmMode.c libdrm_lists.h xf86drmMode.c libdrm_lists.h

2
libdrm/intel/Makefile.am
View File

@ -27,7 +27,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/libdrm \ -I$(top_srcdir)/libdrm \
-I$(top_srcdir)/libdrm/intel \ -I$(top_srcdir)/libdrm/intel \
$(PTHREADSTUBS_CFLAGS) \ $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/shared-core -I$(top_srcdir)/include/drm
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
libdrm_intel_ladir = $(libdir) libdrm_intel_ladir = $(libdir)

2
libdrm/nouveau/Makefile.am
View File

@ -3,7 +3,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/libdrm \ -I$(top_srcdir)/libdrm \
-I$(top_srcdir)/libdrm/nouveau \ -I$(top_srcdir)/libdrm/nouveau \
$(PTHREADSTUBS_CFLAGS) \ $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/shared-core -I$(top_srcdir)/include/drm
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
libdrm_nouveau_ladir = $(libdir) libdrm_nouveau_ladir = $(libdir)

2
libdrm/radeon/Makefile.am
View File

@ -27,7 +27,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/libdrm \ -I$(top_srcdir)/libdrm \
-I$(top_srcdir)/libdrm/radeon \ -I$(top_srcdir)/libdrm/radeon \
$(PTHREADSTUBS_CFLAGS) \ $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/shared-core -I$(top_srcdir)/include/drm
libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
libdrm_radeon_ladir = $(libdir) libdrm_radeon_ladir = $(libdir)

2
tests/Makefile.am
View File

@ -1,7 +1,7 @@
NULL:=# NULL:=#
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I $(top_srcdir)/shared-core \ -I $(top_srcdir)/include/drm \
-I $(top_srcdir)/libdrm -I $(top_srcdir)/libdrm
LDADD = $(top_builddir)/libdrm/libdrm.la LDADD = $(top_builddir)/libdrm/libdrm.la

2
tests/modeprint/Makefile.am
View File

@ -1,5 +1,5 @@
AM_CFLAGS = \ AM_CFLAGS = \
-I$(top_srcdir)/shared-core \ -I$(top_srcdir)/include/drm \
-I$(top_srcdir)/libdrm/intel/ \ -I$(top_srcdir)/libdrm/intel/ \
-I$(top_srcdir)/libdrm -I$(top_srcdir)/libdrm

2
tests/modetest/Makefile.am
View File

@ -1,5 +1,5 @@
AM_CFLAGS = \ AM_CFLAGS = \
-I$(top_srcdir)/shared-core \ -I$(top_srcdir)/include/drm \
-I$(top_srcdir)/libdrm/intel/ \ -I$(top_srcdir)/libdrm/intel/ \
-I$(top_srcdir)/libdrm \ -I$(top_srcdir)/libdrm \
$(CAIRO_CFLAGS) $(CAIRO_CFLAGS)