Skip to content

Commit

Permalink
Move libdrm/ up one level
Browse files Browse the repository at this point in the history
  • Loading branch information
krh committed Nov 17, 2009
1 parent 9dd3613 commit 4f57abf
Show file tree
Hide file tree
Showing 58 changed files with 58 additions and 74 deletions.
File renamed without changes.
35 changes: 33 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,43 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

AUTOMAKE_OPTIONS = foreign
SUBDIRS = libdrm tests

pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm.pc

EXTRA_DIST = libdrm.pc.in include/drm/*
if HAVE_INTEL
INTEL_SUBDIR = intel
endif

if HAVE_NOUVEAU
NOUVEAU_SUBDIR = nouveau
endif

if HAVE_RADEON
RADEON_SUBDIR = radeon
endif

SUBDIRS = . $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests

libdrm_la_LTLIBRARIES = libdrm.la
libdrm_ladir = $(libdir)
libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
libdrm_la_LIBADD = @CLOCK_LIB@

libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm

libdrm_la_SOURCES = \
xf86drm.c \
xf86drmHash.c \
xf86drmRandom.c \
xf86drmSL.c \
xf86drmMode.c \
libdrm_lists.h

libdrmincludedir = ${includedir}
libdrminclude_HEADERS = xf86drm.h xf86drmMode.h

EXTRA_DIST = ChangeLog TODO libdrm.pc.in include/drm/*

copy-headers :
cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include
Expand Down
File renamed without changes.
15 changes: 7 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])

AM_CONFIG_HEADER([libdrm/config.h])
AM_CONFIG_HEADER([config.h])

AC_DISABLE_STATIC
AC_PROG_LIBTOOL
Expand Down Expand Up @@ -197,13 +197,12 @@ AC_SUBST(kernel_source)
AC_SUBST(WARN_CFLAGS)
AC_OUTPUT([
Makefile
libdrm/Makefile
libdrm/intel/Makefile
libdrm/intel/libdrm_intel.pc
libdrm/radeon/Makefile
libdrm/radeon/libdrm_radeon.pc
libdrm/nouveau/Makefile
libdrm/nouveau/libdrm_nouveau.pc
intel/Makefile
intel/libdrm_intel.pc
radeon/Makefile
radeon/libdrm_radeon.pc
nouveau/Makefile
nouveau/libdrm_nouveau.pc
tests/Makefile
tests/modeprint/Makefile
tests/modetest/Makefile
Expand Down
4 changes: 2 additions & 2 deletions libdrm/intel/Makefile.am → intel/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir)/libdrm \
-I$(top_srcdir)/libdrm/intel \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
47 changes: 0 additions & 47 deletions libdrm/Makefile.am

This file was deleted.

File renamed without changes.
5 changes: 3 additions & 2 deletions libdrm/nouveau/Makefile.am → nouveau/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir)/libdrm \
-I$(top_srcdir)/libdrm/nouveau \
-I$(top_srcdir) \
-I$(top_srcdir)/nouveau \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm

Expand Down Expand Up @@ -31,6 +31,7 @@ libdrm_nouveaucommoninclude_HEADERS = \
nouveau_resource.h \
nouveau_class.h


libdrm_nouveauincludedir = ${includedir}/drm
libdrm_nouveauinclude_HEADERS = \
nouveau_drmif.h
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions libdrm/radeon/Makefile.am → radeon/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

AM_CFLAGS = \
$(WARN_CFLAGS) \
-I$(top_srcdir)/libdrm \
-I$(top_srcdir)/libdrm/radeon \
-I$(top_srcdir) \
-I$(top_srcdir)/radeon \
$(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/modeprint/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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

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
8 changes: 4 additions & 4 deletions tests/modetest/Makefile.am
Original file line number Diff line number Diff line change
@@ -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 = \
Expand All @@ -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)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 4f57abf

Please sign in to comment.