mirror of
https://github.com/brl/mutter.git
synced 2024-12-22 19:12:04 +00:00
e4b9a507e3
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
149 lines
4.8 KiB
Makefile
149 lines
4.8 KiB
Makefile
SUBDIRS=pango
|
|
|
|
MARSHALFILES = clutter-marshal.c clutter-marshal.h
|
|
ENUMFILES = clutter-enum-types.c clutter-enum-types.h
|
|
STAMPFILES = stamp-clutter-marshal.h stamp-clutter-enum-types.h
|
|
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
|
|
GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0`
|
|
|
|
BUILT_SOURCES = $(MARSHALFILES) $(ENUMFILES)
|
|
|
|
source_h = \
|
|
$(srcdir)/clutter-keysyms.h \
|
|
$(srcdir)/clutter-util.h \
|
|
$(srcdir)/clutter-fixed.h \
|
|
$(srcdir)/clutter-event.h \
|
|
$(srcdir)/clutter-color.h \
|
|
$(srcdir)/clutter-feature.h \
|
|
$(srcdir)/clutter-timeline.h \
|
|
$(srcdir)/clutter-actor.h \
|
|
$(srcdir)/clutter-group.h \
|
|
$(srcdir)/clutter-stage.h \
|
|
$(srcdir)/clutter-rectangle.h \
|
|
$(srcdir)/clutter-texture.h \
|
|
$(srcdir)/clutter-clone-texture.h \
|
|
$(srcdir)/clutter-label.h \
|
|
$(srcdir)/clutter-behaviour.h \
|
|
$(srcdir)/clutter-behaviour-opacity.h \
|
|
$(srcdir)/clutter-behaviour-path.h \
|
|
$(srcdir)/clutter-behaviour-scale.h \
|
|
$(srcdir)/clutter-alpha.h \
|
|
$(srcdir)/clutter-media.h \
|
|
$(srcdir)/clutter-version.h \
|
|
$(srcdir)/clutter-main.h
|
|
|
|
clutter-marshal.h: stamp-clutter-marshal.h
|
|
@true
|
|
stamp-clutter-marshal.h: clutter-marshal.list
|
|
$(GLIB_GENMARSHAL) \
|
|
--prefix=clutter_marshal \
|
|
--header \
|
|
$(srcdir)/clutter-marshal.list > xgen-cmh \
|
|
&& (cmp -s xgen-cmh clutter-marshal.h || cp xgen-cmh clutter-marshal.h ) \
|
|
&& rm -f xgen-cmh \
|
|
&& echo timestamp > $(@F)
|
|
|
|
clutter-marshal.c: clutter-marshal.h Makefile
|
|
( echo "#include \"clutter-marshal.h\"" ; \
|
|
$(GLIB_GENMARSHAL) \
|
|
--prefix=clutter_marshal \
|
|
--body \
|
|
$(srcdir)/clutter-marshal.list --body ) >> xgen-cmc \
|
|
&& cp xgen-cmc clutter-marshal.c \
|
|
&& rm -f xgen-cmc
|
|
|
|
clutter-enum-types.h: stamp-clutter-enum-types.h
|
|
@true
|
|
stamp-clutter-enum-types.h: $(source_h) Makefile
|
|
$(GLIB_MKENUMS) \
|
|
--fhead "#ifndef __CLUTTER_ENUM_TYPES_H__\n" \
|
|
--fhead "#define __CLUTTER_ENUM_TYPES_H__\n\n" \
|
|
--fhead "G_BEGIN_DECLS\n\n" \
|
|
--ftail "G_END_DECLS\n\n" \
|
|
--ftail "#endif\n" \
|
|
--fprod "/* --- @filename@ --- */\n" \
|
|
--eprod "#define CLUTTER_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
|
|
--eprod "GType @enum_name@_get_type (void);\n\n" \
|
|
$(source_h) >> xgen-ceth \
|
|
&& (cmp xgen-ceth clutter-enum-types.h || cp xgen-ceth clutter-enum-types.h) \
|
|
&& rm -f xgen-ceth \
|
|
&& echo timestamp > $(@F)
|
|
|
|
clutter-enum-types.c: clutter-enum-types.h
|
|
$(GLIB_MKENUMS) \
|
|
--fhead "#include <glib-object.h>\n" \
|
|
--fhead "#include \"clutter-enum-types.h\"\n" \
|
|
--fprod "\n/* enumerations from \"@filename@\" */" \
|
|
--fprod "\n#include \"@filename@\"" \
|
|
--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
|
|
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
|
|
--vtail " { 0, NULL, NULL }\n};\n\n" \
|
|
--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
|
|
--vtail " static GType type = 0;\n\n" \
|
|
--vtail " if (!type)\n" \
|
|
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
|
|
--vtail " return type;\n}\n\n" \
|
|
$(source_h) >> xgen-cetc \
|
|
&& cp xgen-cetc clutter-enum-types.c \
|
|
&& rm -f xgen-cetc
|
|
|
|
CLEANFILES = \
|
|
$(BUILT_SOURCES) \
|
|
$(STAMPFILES)
|
|
|
|
source_c = clutter-main.c \
|
|
clutter-util.c \
|
|
clutter-feature.c \
|
|
clutter-event.c \
|
|
clutter-color.c \
|
|
clutter-timeline.c \
|
|
clutter-group.c \
|
|
clutter-stage.c \
|
|
clutter-rectangle.c \
|
|
clutter-texture.c \
|
|
clutter-clone-texture.c \
|
|
clutter-label.c \
|
|
clutter-actor.c \
|
|
clutter-behaviour.c \
|
|
clutter-behaviour-opacity.c \
|
|
clutter-behaviour-path.c \
|
|
clutter-behaviour-scale.c \
|
|
clutter-alpha.c \
|
|
clutter-media.c \
|
|
clutter-enum-types.c
|
|
|
|
source_h_priv = clutter-debug.h clutter-private.h
|
|
|
|
libclutter_@CLUTTER_MAJORMINOR@_la_SOURCES = $(MARSHALFILES) \
|
|
$(source_c) \
|
|
$(source_h) \
|
|
$(source_h_priv)
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir) \
|
|
-I$(top_srcdir)/clutter/pango \
|
|
-DPREFIX=\""$(prefix)"\" \
|
|
-DLIBDIR=\""$(libdir)"\" \
|
|
-DDATADIR=\""$(datadir)"\" \
|
|
-DG_DISABLE_DEPRECATED \
|
|
-DG_LOG_DOMAIN=\"Clutter\" \
|
|
$(GCC_FLAGS) \
|
|
$(CLUTTER_CFLAGS) \
|
|
$(CLUTTER_DEBUG_CFLAGS)
|
|
|
|
lib_LTLIBRARIES = libclutter-@CLUTTER_MAJORMINOR@.la
|
|
|
|
libclutter_@CLUTTER_MAJORMINOR@_la_LIBADD = \
|
|
@CLUTTER_LIBS@ $(top_srcdir)/clutter/pango/libpangoclutter.la
|
|
libclutter_@CLUTTER_MAJORMINOR@_la_LDFLAGS = @CLUTTER_LT_LDFLAGS@
|
|
libclutter_@CLUTTER_MAJORMINOR@_la_DEPENDENCIES = \
|
|
$(top_srcdir)/clutter/pango/libpangoclutter.a
|
|
|
|
clutterheadersdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
|
|
clutterheaders_HEADERS = $(source_h) \
|
|
clutter-marshal.h \
|
|
clutter-enum-types.h \
|
|
clutter.h
|
|
|
|
EXTRA_DIST = clutter-marshal.list clutter-version.h.in
|