scons: rework the EGL build

The scons equivalent of the previous commit - just fold the almost
identical driver + main Sconscripts.

Cc: Alexander von Gluck IV <kallisti5@unixzen.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/SConscript b/src/SConscript
index 46482fb..106b87d 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -32,8 +32,7 @@ if not env['embedded']:
     if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
         SConscript('glx/SConscript')
     if env['platform'] == 'haiku':
-        SConscript('egl/drivers/haiku/SConscript')
-        SConscript('egl/main/SConscript')
+        SConscript('egl/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 6f9abce..10eb1d5 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -111,10 +111,9 @@ egl_HEADERS = \
        $(top_srcdir)/include/EGL/eglplatform.h
 
 EXTRA_DIST = \
+       SConscript \
        drivers/haiku \
        docs \
        main/egl.def \
        main/README.txt \
-       main/SConscript \
-       main/Makefile.sources \
-       drivers/dri2/SConscript
+       main/Makefile.sources

diff --git a/src/egl/main/SConscript b/src/egl/SConscript
similarity index 74%
rename from src/egl/main/SConscript
rename to src/egl/SConscript
index 631ba20..a7f6282 100644 (file)
--- a/src/egl/main/SConscript
+++ b/src/egl/SConscript
@@ -6,21 +6,22 @@ Import('*')
 
 env = env.Clone()
 
-env.Append(CPPDEFINES = [
-    '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU',
-    '_EGL_BUILT_IN_DRIVER_HAIKU',
-])
-env.Prepend(LIBS = [
-    egl_haiku,
-])
-
 env.Append(CPPPATH = [
     '#/include',
+    '#/src/egl/main',
 ])
 
 
 # parse Makefile.sources
 egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES')
+egl_sources.append(env.ParseSourceList('Makefile.sources', 'dri2_backend_core_FILES'))
+
+env.Append(CPPDEFINES = [
+    '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU',
+    '_EGL_BUILT_IN_DRIVER_HAIKU',
+    'HAVE_HAIKU_PLATFORM',
+])
+egl_sources.append('drivers/haiku/egl_haiku.cpp')
 
 egl = env.SharedLibrary(
     target = 'EGL',

diff --git a/src/egl/drivers/haiku/SConscript b/src/egl/drivers/haiku/SConscript
deleted file mode 100644 (file)
index 9db7ecf..0000000
--- a/src/egl/drivers/haiku/SConscript
+++ /dev/null
@@ -1,25 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
-       '#/include',
-       '#/src/egl/main',
-])
-
-sources = [
-       'egl_haiku.cpp'
-]
-
-if env['platform'] == 'haiku':
-       env.Append(CPPDEFINES = [
-               'HAVE_HAIKU_PLATFORM',
-               '_EGL_NATIVE_PLATFORM=haiku',
-       ])
-
-egl_haiku = env.ConvenienceLibrary(
-       target = 'egl_haiku',
-       source = sources,
-)
-
-Export('egl_haiku')