Skip to content

Commit

Permalink
Bug 784841 - Part 18o: Convert /gfx; r=jrmuizel f=Ms2ger
Browse files Browse the repository at this point in the history
  • Loading branch information
indygreg committed Feb 25, 2013
1 parent 168592e commit 6145f28
Show file tree
Hide file tree
Showing 24 changed files with 132 additions and 26 deletions.
5 changes: 5 additions & 0 deletions gfx/2d/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

14 changes: 0 additions & 14 deletions gfx/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,4 @@ include $(DEPTH)/config/autoconf.mk

MODULE = gfx

ifdef MOZ_TREE_CAIRO
DIRS = cairo
endif

DIRS += 2d ycbcr angle src qcms gl layers graphite2/src harfbuzz/src ots/src thebes ipc

ifdef MOZ_ENABLE_SKIA
DIRS += skia
endif

ifdef ENABLE_TESTS
TOOL_DIRS += tests
endif

include $(topsrcdir)/config/rules.mk
3 changes: 0 additions & 3 deletions gfx/angle/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@ CPPSRCS += \

ifdef MOZ_ANGLE_RENDERER

# libEGL depends on (links against!) libGLESv2!
DIRS = src/libGLESv2 src/libEGL

libs::
ifdef MOZ_D3DCOMPILER_CAB
expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
Expand Down
8 changes: 8 additions & 0 deletions gfx/angle/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# libEGL depends on (links against!) libGLESv2!
if CONFIG['MOZ_ANGLE_RENDERER']:
DIRS += ['src/libGLESv2', 'src/libEGL']
5 changes: 5 additions & 0 deletions gfx/angle/src/libEGL/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/angle/src/libGLESv2/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

7 changes: 0 additions & 7 deletions gfx/cairo/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,5 @@ srcdir = @srcdir@
VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

DIRS = cairo/src

ifdef MOZ_TREE_PIXMAN
DIRS += libpixman/src
endif

include $(topsrcdir)/config/rules.mk

2 changes: 0 additions & 2 deletions gfx/cairo/cairo/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -238,5 +238,3 @@ ifdef MOZ_TREE_FREETYPE
DEFINES += -DHAVE_FT_LIBRARY_SETLCDFILTER -DFT_LCD_FILTER_H="$(topsrcdir)/modules/freetype2/include/freetype/ftlcdfil.h"
endif

cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)
$(PYTHON) $(DEPTH)/config.status -n --file=$@
7 changes: 7 additions & 0 deletions gfx/cairo/cairo/src/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CONFIGURE_SUBST_FILES += ['cairo-features.h']

5 changes: 5 additions & 0 deletions gfx/cairo/libpixman/src/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

10 changes: 10 additions & 0 deletions gfx/cairo/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

DIRS += ['cairo/src']

if CONFIG['MOZ_TREE_PIXMAN']:
DIRS += ['libpixman/src']

5 changes: 5 additions & 0 deletions gfx/gl/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/graphite2/src/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/harfbuzz/src/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/ipc/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/layers/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

27 changes: 27 additions & 0 deletions gfx/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo']

DIRS += [
'2d',
'ycbcr',
'angle',
'src',
'qcms',
'gl',
'layers',
'graphite2/src',
'harfbuzz/src',
'ots/src',
'thebes',
'ipc',
]

if CONFIG['MOZ_ENABLE_SKIA']:
DIRS += ['skia']

TEST_TOOL_DIRS += ['tests']
5 changes: 5 additions & 0 deletions gfx/ots/src/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/qcms/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/skia/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/src/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/tests/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/thebes/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

5 changes: 5 additions & 0 deletions gfx/ycbcr/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

0 comments on commit 6145f28

Please sign in to comment.