The scons equivalent of the previous commit - just fold the almost
identical driver + main Sconscripts.
Cc: Alexander von Gluck IV <kallis...@unixzen.com>
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
src/SConscript | 3 +--
src/egl/Makefile.am | 5 ++---
src/egl/SConscript | 33 +++++++++++++++++++++++++++++++++
src/egl/drivers/haiku/SConscript | 25 -------------------------
src/egl/main/SConscript | 32 --------------------------------
5 files changed, 36 insertions(+), 62 deletions(-)
create mode 100644 src/egl/SConscript
delete mode 100644 src/egl/drivers/haiku/SConscript
delete mode 100644 src/egl/main/SConscript
diff --git a/src/SConscript b/src/SConscript
index 46482fb..106b87d 100644
--- 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 e6862d2..767bb53 100644
--- 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/SConscript b/src/egl/SConscript
new file mode 100644
index 0000000..a7f6282
--- /dev/null
+++ b/src/egl/SConscript
@@ -0,0 +1,33 @@
+#######################################################################
+# SConscript for EGL
+
+
+Import('*')
+
+env = env.Clone()
+
+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',
+ source = egl_sources,
+)
+
+egl = env.InstallSharedLibrary(egl, version=(1, 0, 0))
+
+env.Alias('egl', egl)
diff --git a/src/egl/drivers/haiku/SConscript b/src/egl/drivers/haiku/SConscript
deleted file mode 100644
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')
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
deleted file mode 100644
index 631ba20..0000000
--- a/src/egl/main/SConscript
+++ /dev/null
@@ -1,32 +0,0 @@
-#######################################################################
-# SConscript for EGL
-
-
-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',
-])
-
-
-# parse Makefile.sources
-egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES')
-
-egl = env.SharedLibrary(
- target = 'EGL',
- source = egl_sources,
-)
-
-egl = env.InstallSharedLibrary(egl, version=(1, 0, 0))
-
-env.Alias('egl', egl)
--
2.4.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
