diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-27 15:33:19 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-28 14:51:56 +0100 |
| commit | bd6ffd1ad2f903215d2c631252e742a0f6893054 (patch) | |
| tree | 6e83f82ef2cd485e69bee365e368be56a7e45150 /src | |
| parent | d92b5ddcff03a593270d060187b56ee2aa8e09b3 (diff) | |
configure: Print a summary of compilation options
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/legacy/i810/Makefile.am | 4 | ||||
| -rw-r--r-- | src/legacy/i810/xvmc/Makefile.am | 4 | ||||
| -rw-r--r-- | src/sna/Makefile.am | 4 | ||||
| -rw-r--r-- | src/uxa/Makefile.am | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am index 51489b8c..8414c5f3 100644 --- a/src/legacy/i810/Makefile.am +++ b/src/legacy/i810/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = xvmc noinst_LTLIBRARIES = liblegacy-i810.la -AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \ +AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ @PCIACCESS_CFLAGS@ \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/legacy \ $(NULL) @@ -29,7 +29,7 @@ liblegacy_i810_la_SOURCES += \ i810_dga.c endif -if DRI +if DRI1 liblegacy_i810_la_SOURCES +=\ i810_dri.c \ i810_dri.h \ diff --git a/src/legacy/i810/xvmc/Makefile.am b/src/legacy/i810/xvmc/Makefile.am index 1bac3119..7f28b8bb 100644 --- a/src/legacy/i810/xvmc/Makefile.am +++ b/src/legacy/i810/xvmc/Makefile.am @@ -5,7 +5,7 @@ endif libI810XvMC_la_SOURCES = I810XvMC.c \ I810XvMC.h -AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -DTRUE=1 -DFALSE=0 +AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ -DTRUE=1 -DFALSE=0 libI810XvMC_la_LDFLAGS = -version-number 1:0:0 -libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ +libI810XvMC_la_LIBADD = @DRI1_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am index aebbfc21..1551d31d 100644 --- a/src/sna/Makefile.am +++ b/src/sna/Makefile.am @@ -93,9 +93,9 @@ libsna_la_SOURCES = \ $(NULL) if DRI2 -AM_CFLAGS += @DRI_CFLAGS@ +AM_CFLAGS += @DRI2_CFLAGS@ libsna_la_SOURCES += sna_dri.c -libsna_la_LIBADD += $(DRI_LIBS) @CLOCK_GETTIME_LIBS@ +libsna_la_LIBADD += $(DRI2_LIBS) @CLOCK_GETTIME_LIBS@ endif if XVMC diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am index 945d7d42..dfb556fc 100644 --- a/src/uxa/Makefile.am +++ b/src/uxa/Makefile.am @@ -70,11 +70,12 @@ libuxa_la_SOURCES += \ endif if DRI2 +AM_CFLAGS += @DRI2_CFLAGS@ libuxa_la_SOURCES += \ intel_dri.c \ $(NULL) libuxa_la_LIBADD += \ - $(DRI_LIBS) \ + $(DRI2_LIBS) \ @CLOCK_GETTIME_LIBS@ \ $(NULL) endif |