KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

winsys/sw: automake: consistently use Makefile.sources 

- Include the headers within.
 - Update scons to use them.
 - Drop useless include (gallium/drivers) from scons.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2014-08-17 20:15:07 +01:00
parent f0ae81cc13
commit 95603e259b
20 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/winsys/sw/dri/Makefile.am
View File

@ -20,6 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@ -27,4 +28,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libswdri.la
libswdri_la_SOURCES = dri_sw_winsys.c
libswdri_la_SOURCES = $(C_SOURCES)

3
src/gallium/winsys/sw/dri/Makefile.sources Normal file
View File

@ -0,0 +1,3 @@
C_SOURCES := \
dri_sw_winsys.c \
dri_sw_winsys.h

5
src/gallium/winsys/sw/dri/SConscript
View File

@ -11,13 +11,10 @@ if env['platform'] in ('linux', 'sunos'):
env.Append(CPPPATH = [
'#/src/gallium/include',
'#/src/gallium/auxiliary',
'#/src/gallium/drivers',
])
ws_dri = env.ConvenienceLibrary(
target = 'ws_dri',
source = [
'dri_sw_winsys.c',
]
source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
)
Export('ws_dri')

3
src/gallium/winsys/sw/fbdev/Makefile.am
View File

@ -20,6 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@ -27,4 +28,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libfbdev.la
libfbdev_la_SOURCES = fbdev_sw_winsys.c
libfbdev_la_SOURCES = $(C_SOURCES)

3
src/gallium/winsys/sw/fbdev/Makefile.sources Normal file
View File

@ -0,0 +1,3 @@
C_SOURCES := \
fbdev_sw_winsys.c \
fbdev_sw_winsys.h

5
src/gallium/winsys/sw/fbdev/SConscript
View File

@ -11,13 +11,10 @@ if env['platform'] == 'linux':
env.Append(CPPPATH = [
'#/src/gallium/include',
'#/src/gallium/auxiliary',
'#/src/gallium/drivers',
])
ws_fbdev = env.ConvenienceLibrary(
target = 'ws_fbdev',
source = [
'fbdev_sw_winsys.c',
]
source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
)
Export('ws_fbdev')

3
src/gallium/winsys/sw/kms-dri/Makefile.am
View File

@ -21,6 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@ -29,4 +30,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libswkmsdri.la
libswkmsdri_la_SOURCES = kms_dri_sw_winsys.c
libswkmsdri_la_SOURCES = $(C_SOURCES)

3
src/gallium/winsys/sw/kms-dri/Makefile.sources Normal file
View File

@ -0,0 +1,3 @@
C_SOURCES := \
kms_dri_sw_winsys.c \
kms_dri_sw_winsys.h

5
src/gallium/winsys/sw/kms-dri/SConscript
View File

@ -12,15 +12,12 @@ env = env.Clone()
env.PkgUseModules('DRM')
env.Append(CPPPATH = [
# 'include',
'#/src/gallium/include',
'#/src/gallium/auxiliary',
])
ws_kms_dri = env.ConvenienceLibrary(
target = 'ws_kms_dri',
source = [
'kms_dri_sw_winsys.c',
]
source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
)
Export('ws_kms_dri')

3
src/gallium/winsys/sw/null/Makefile.am
View File

@ -20,6 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@ -27,4 +28,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libws_null.la
libws_null_la_SOURCES = null_sw_winsys.c
libws_null_la_SOURCES = $(C_SOURCES)

3
src/gallium/winsys/sw/null/Makefile.sources Normal file
View File

@ -0,0 +1,3 @@
C_SOURCES := \
null_sw_winsys.c \
null_sw_winsys.h

5
src/gallium/winsys/sw/null/SConscript
View File

@ -9,14 +9,11 @@ env = env.Clone()
env.Append(CPPPATH = [
'#/src/gallium/include',
'#/src/gallium/auxiliary',
'#/src/gallium/drivers',
])
ws_null = env.ConvenienceLibrary(
target = 'ws_null',
source = [
'null_sw_winsys.c',
]
source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
)
env.Alias('ws_null', ws_null)
Export('ws_null')

3
src/gallium/winsys/sw/wayland/Makefile.am
View File

@ -20,6 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@ -28,4 +29,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libws_wayland.la
libws_wayland_la_SOURCES = wayland_sw_winsys.c
libws_wayland_la_SOURCES = $(C_SOURCES)

3
src/gallium/winsys/sw/wayland/Makefile.sources Normal file
View File

@ -0,0 +1,3 @@
C_SOURCES := \
wayland_sw_winsys.c \
wayland_sw_winsys.h

3
src/gallium/winsys/sw/wrapper/Makefile.am
View File

@ -20,6 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@ -27,4 +28,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libwsw.la
libwsw_la_SOURCES = wrapper_sw_winsys.c
libwsw_la_SOURCES = $(C_SOURCES)

3
src/gallium/winsys/sw/wrapper/Makefile.sources Normal file
View File

@ -0,0 +1,3 @@
C_SOURCES := \
wrapper_sw_winsys.c \
wrapper_sw_winsys.h

5
src/gallium/winsys/sw/wrapper/SConscript
View File

@ -9,13 +9,10 @@ env = env.Clone()
env.Append(CPPPATH = [
'#/src/gallium/include',
'#/src/gallium/auxiliary',
'#/src/gallium/drivers',
])
ws_wrapper = env.ConvenienceLibrary(
target = 'ws_wrapper',
source = [
'wrapper_sw_winsys.c',
]
source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
)
Export('ws_wrapper')

3
src/gallium/winsys/sw/xlib/Makefile.am
View File

@ -20,6 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@ -28,4 +29,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libws_xlib.la
libws_xlib_la_SOURCES = xlib_sw_winsys.c
libws_xlib_la_SOURCES = $(C_SOURCES)

3
src/gallium/winsys/sw/xlib/Makefile.sources Normal file
View File

@ -0,0 +1,3 @@
C_SOURCES := \
xlib_sw_winsys.c \
xlib_sw_winsys.h

5
src/gallium/winsys/sw/xlib/SConscript
View File

@ -11,14 +11,11 @@ if env['platform'] in ('cygwin', 'darwin', 'freebsd', 'linux', 'sunos'):
env.Append(CPPPATH = [
'#/src/gallium/include',
'#/src/gallium/auxiliary',
'#/src/gallium/drivers',
])
ws_xlib = env.ConvenienceLibrary(
target = 'ws_xlib',
source = [
'xlib_sw_winsys.c',
]
source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
)
env.Alias('ws_xlib', ws_xlib)
Export('ws_xlib')