diff options
| author | Emil Velikov <[email protected]> | 2014-08-17 20:15:07 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-08-28 21:24:39 +0100 |
| commit | 95603e259b6afdab50c4330696a8fbede80327f1 (patch) | |
| tree | 0899ea6641a30d5f5ecd44a44e26697f183797be /src/gallium/winsys/sw/xlib | |
| parent | f0ae81cc1317a144626f2d0160942936a4c20457 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/gallium/winsys/sw/xlib')
| -rw-r--r-- | src/gallium/winsys/sw/xlib/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/xlib/Makefile.sources | 3 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/xlib/SConscript | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am index a38189c0fee..825a8fdb5e1 100644 --- a/src/gallium/winsys/sw/xlib/Makefile.am +++ b/src/gallium/winsys/sw/xlib/Makefile.am @@ -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) diff --git a/src/gallium/winsys/sw/xlib/Makefile.sources b/src/gallium/winsys/sw/xlib/Makefile.sources new file mode 100644 index 00000000000..fc6a56d4993 --- /dev/null +++ b/src/gallium/winsys/sw/xlib/Makefile.sources @@ -0,0 +1,3 @@ +C_SOURCES := \ + xlib_sw_winsys.c \ + xlib_sw_winsys.h diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript index 3a8c75dfdaf..64db2013936 100644 --- a/src/gallium/winsys/sw/xlib/SConscript +++ b/src/gallium/winsys/sw/xlib/SConscript @@ -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') |