isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-12 17:27:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "clutter.modules: Remove deps on gir-repository"

Browse Source 
This reverts commit 0ce9cf730b.

The commit contained unrelated changes
This commit is contained in:
Emmanuele Bassi 2010-08-13 18:12:43 +01:00
parent 0ce9cf730b
commit a25cf14e97
2 changed files with 52 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/clutter.modules
View File

@ -205,6 +205,7 @@
<dep package="pango"/> <dep package="pango"/>
<dep package="gdk-pixbuf"/> <dep package="gdk-pixbuf"/>
<dep package="gobject-introspection"/> <dep package="gobject-introspection"/>
<dep package="gir-repository"/>
<dep package="json-glib"/> <dep package="json-glib"/>
</dependencies> </dependencies>
</autotools> </autotools>
@ -368,6 +369,9 @@
<dependencies> <dependencies>
<dep package="gobject-introspection"/> <dep package="gobject-introspection"/>
</dependencies> </dependencies>
<after>
<dep package="gir-repository"/>
</after>
</autotools> </autotools>
</moduleset> </moduleset>

117
tests/conform/Makefile.am
View File

@ -4,84 +4,63 @@ NULL =
noinst_PROGRAMS = test-conformance noinst_PROGRAMS = test-conformance
# the common sources test_conformance_SOURCES = \
common_sources = \ test-conform-main.c \
test-conform-common.h \ test-conform-common.c \
test-conform-common.c \ test-conform-common.h \
test-conform-main.c \ \
$(NULL)
# the unit-specific sources; please: keep all sections in alphabetical order!
units_sources =
# animation tests
units_sources += \
test-animator.c \
test-behaviours.c \
test-score.c \
test-state.c \
test-timeline.c \
test-timeline-interpolate.c \ test-timeline-interpolate.c \
test-timeline-rewind.c \ test-timeline-rewind.c \
$(NULL) test-timeline.c \
test-cogl-vertex-buffer-contiguous.c \
# cogl tests test-cogl-vertex-buffer-interleved.c \
units_sources += \ test-cogl-vertex-buffer-mutability.c \
test-cogl-backface-culling.c \ test-cogl-fixed.c \
test-cogl-blend-strings.c \ test-cogl-backface-culling.c \
test-cogl-depth-test.c \ test-cogl-npot-texture.c \
test-cogl-fixed.c \ test-cogl-blend-strings.c \
test-cogl-materials.c \ test-cogl-premult.c \
test-cogl-viewport.c \ test-cogl-materials.c \
test-cogl-multitexture.c \ test-cogl-viewport.c \
test-cogl-npot-texture.c \ test-cogl-offscreen.c \
test-cogl-object.c \ test-cogl-readpixels.c \
test-cogl-offscreen.c \ test-cogl-multitexture.c \
test-cogl-path.c \ test-cogl-texture-mipmaps.c \
test-cogl-pixel-buffer.c \ test-cogl-texture-rectangle.c \
test-cogl-premult.c \ test-cogl-texture-3d.c \
test-cogl-readpixels.c \ test-cogl-texture-pixmap-x11.c \
test-cogl-sub-texture.c \ test-cogl-texture-get-set-data.c \
test-cogl-texture-3d.c \ test-cogl-wrap-modes.c \
test-cogl-texture-get-set-data.c \ test-cogl-pixel-buffer.c \
test-cogl-texture-mipmaps.c \ test-cogl-path.c \
test-cogl-texture-pixmap-x11.c \ test-cogl-object.c \
test-cogl-texture-rectangle.c \ test-cogl-depth-test.c \
test-cogl-vertex-buffer-contiguous.c \
test-cogl-vertex-buffer-interleved.c \
test-cogl-vertex-buffer-mutability.c \
test-cogl-wrap-modes.c \
$(NULL)
# actors tests
units_sources += \
test-actor-destroy.c \
test-actor-size.c \
test-actor-invariants.c \
test-anchors.c \
test-binding-pool.c \
test-clutter-cairo-texture.c \
test-clutter-rectangle.c \
test-clutter-text.c \
test-clutter-texture.c \
test-group.c \
test-path.c \ test-path.c \
test-paint-opacity.c \
test-pick.c \ test-pick.c \
test-texture-fbo.c \ test-clutter-rectangle.c \
test-actor-invariants.c \
test-paint-opacity.c \
test-binding-pool.c \
test-clutter-text.c \
test-clutter-cairo-texture.c \
test-text-cache.c \ test-text-cache.c \
$(NULL) test-anchors.c \
# objects tests
units_sources += \
test-clutter-units.c \
test-color.c \
test-model.c \ test-model.c \
test-color.c \
test-clutter-units.c \
test-group.c \
test-actor-size.c \
test-texture-fbo.c \
test-cogl-sub-texture.c \
test-script-parser.c \ test-script-parser.c \
test-actor-destroy.c \
test-behaviours.c \
test-animator.c \
test-state.c \
test-clutter-texture.c \
test-score.c \
$(NULL) $(NULL)
test_conformance_SOURCES = $(common_sources) $(units_sources)
# For convenience, this provides a way to easily run individual unit tests: # For convenience, this provides a way to easily run individual unit tests:
.PHONY: wrappers clean-wrappers .PHONY: wrappers clean-wrappers