sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

2006-06-21 Emmanuele Bassi <ebassi@openedhand.com>

Browse source 
* clutter/Makefile.am:
	* bindings/python/Makefile.am:
	* Makefile.am: Fix distcheck
This commit is contained in:
Emmanuele Bassi 2006-06-21 15:54:46 +00:00
parent f6413c66e9
commit c8d963f80d
5 changed files with 53 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-06-21 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/Makefile.am:
* bindings/python/Makefile.am:
* Makefile.am: Fix distcheck
2006-06-21 Ross Burton <ross@openedhand.com> 2006-06-21 Ross Burton <ross@openedhand.com>
* clutter/Makefile.am: * clutter/Makefile.am:

2
Makefile.am
View file

@ -16,7 +16,7 @@ EXTRA_DIST = clutter.pc.in
CLEANFILES = $(pcfiles) CLEANFILES = $(pcfiles)
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-python
# Extra clean files so that maintainer-clean removes *everything* # Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \

49
bindings/python/Makefile.am
View file

@ -1,45 +1,47 @@
AUTOMAKE_OPTIONS = 1.7 AUTOMAKE_OPTIONS = 1.7
CLEANFILES = CLEANFILES =
EXTRA_DIST =
CLUTTER_DEFS = clutter-base.defs CLUTTER_DEFS = clutter-base.defs
CLUTTER_TYPES_DEFS = clutter-base-types.defs CLUTTER_TYPES_DEFS = clutter-base-types.defs
CREATEDEFS = $(PYTHON) createdefs.py
CLUTTER_OVERRIDES = clutter.override CLUTTER_OVERRIDES = clutter.override
CLEANFILES += \ CLEANFILES += \
clutter.defs \ clutter.defs \
clutter-types.defs clutter-types.defs
EXTRA_DIST += \ EXTRA_DIST = \
$(CLUTTER_DEFS) \ clutter-base.defs \
$(CLUTTER_TYPES_DEFS) \ clutter-base-types.defs \
$(CLUTTER_OVERRIDES) clutter.override
clutter.defs: $(CLUTTER_DEFS) clutter.defs: Makefile stamp-clutter.defs
@echo "*** Creating clutter.defs" && \ @true
echo ";; -*- scheme -*-" > gen-cdefs && \ stamp-clutter.defs: $(CLUTTER_DEFS)
echo ";; THIS FILE IS AUTOGENERATED" >> gen-cdefs && \ @echo "*** Creating clutter.defs" && \
for p in $(CLUTTER_DEFS); do \ echo ";; -*- scheme -*-" > gen-cdefs && \
echo "(include \"$$p\")" >> gen-cdefs; \ echo ";; THIS FILE IS AUTOGENERATED" >> gen-cdefs && \
done && \ for p in $(CLUTTER_DEFS); do \
(cmp -s gen-cdefs clutter.defs || cp gen-cdefs clutter.defs) && \ echo "(include \"$(top_srcdir)/bindings/python/$$p\")" >> gen-cdefs; \
rm -f gen-cdefs done && \
clutter.defs: Makefile (cmp -s gen-cdefs clutter.defs || cp gen-cdefs clutter.defs) && \
rm -f gen-cdefs && \
echo "timestamp" > $(@F)
clutter-types.defs: $(CLUTTER_TYPES_DEFS) clutter-types.defs: Makefile stamp-clutter-types.defs
@true
stamp-clutter-types.defs: $(CLUTTER_TYPES_DEFS)
@echo "*** Creating clutter-types.defs" && \ @echo "*** Creating clutter-types.defs" && \
echo ";; -*- scheme -*-" > gen-ctdefs && \ echo ";; -*- scheme -*-" > gen-ctdefs && \
echo ";; THIS FILE IS AUTOGENERATED" >> gen-ctdefs && \ echo ";; THIS FILE IS AUTOGENERATED" >> gen-ctdefs && \
for p in $(CLUTTER_TYPES_DEFS); do \ for p in $(CLUTTER_TYPES_DEFS); do \
echo "(include \"$$p\")" >> gen-ctdefs; \ echo "(include \"$(top_srcdir)/bindings/python/$$p\")" >> gen-ctdefs; \
done && \ done && \
(cmp -s gen-ctdefs clutter-types.defs || cp gen-ctdefs clutter-types.defs) && \ (cmp -s gen-ctdefs clutter-types.defs || cp gen-ctdefs clutter-types.defs) && \
rm -f gen-ctdefs rm -f gen-ctdefs && \
clutter-types.defs: Makefile echo "timestamp" > $(@F)
CLEANFILES += stamp-clutter.defs stamp-clutter-types.defs
clutter-pyglue.c: clutter.defs clutter-types.defs $(CLUTTER_OVERRIDES) clutter-pyglue.c: clutter.defs clutter-types.defs $(CLUTTER_OVERRIDES)
$(PYGTK_CODEGEN) \ $(PYGTK_CODEGEN) \
@ -47,7 +49,7 @@ clutter-pyglue.c: clutter.defs clutter-types.defs $(CLUTTER_OVERRIDES)
--register $(PYGTK_DEFSDIR)/gtk-types.defs \ --register $(PYGTK_DEFSDIR)/gtk-types.defs \
--register $(PYGTK_DEFSDIR)/pango-types.defs \ --register $(PYGTK_DEFSDIR)/pango-types.defs \
--register clutter-types.defs \ --register clutter-types.defs \
--override $(CLUTTER_OVERRIDES) \ --override $(top_srcdir)/bindings/python/$(CLUTTER_OVERRIDES) \
--prefix clutter \ --prefix clutter \
clutter.defs > gen-$@ && \ clutter.defs > gen-$@ && \
(cmp -s $@ gen-$@ || cp gen-$@ $@) && \ (cmp -s $@ gen-$@ || cp gen-$@ $@) && \
@ -60,7 +62,6 @@ python_LTLIBRARIES = clutter.la
INCLUDES = $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) -I$(top_srcdir) $(CLUTTER_CFLAGS) INCLUDES = $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) -I$(top_srcdir) $(CLUTTER_CFLAGS)
clutter_la_DEPENDENCIES = cluttermodule.c clutter-pyglue.c
clutter_la_SOURCES = clutter-pyglue.c cluttermodule.c clutter_la_SOURCES = clutter-pyglue.c cluttermodule.c
clutter_la_LIBADD = $(PYTHON_LIBS) $(PYGTK_LIBS) \ clutter_la_LIBADD = $(PYTHON_LIBS) $(PYGTK_LIBS) \
$(top_builddir)/clutter/libclutter-@CLUTTER_MAJORMINOR@.la $(top_builddir)/clutter/libclutter-@CLUTTER_MAJORMINOR@.la

37
clutter/Makefile.am
View file

@ -5,27 +5,30 @@ GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0`
BUILT_SOURCES = $(MARSHALFILES) $(ENUMFILES) BUILT_SOURCES = $(MARSHALFILES) $(ENUMFILES)
source_h = clutter-keysyms.h \ source_h = \
clutter-util.h \ $(srcdir)/clutter-keysyms.h \
clutter-media.h \ $(srcdir)/clutter-util.h \
clutter-event.h \ $(srcdir)/clutter-media.h \
clutter-color.h \ $(srcdir)/clutter-event.h \
clutter-timeline.h \ $(srcdir)/clutter-color.h \
clutter-actor.h \ $(srcdir)/clutter-timeline.h \
clutter-group.h \ $(srcdir)/clutter-actor.h \
clutter-stage.h \ $(srcdir)/clutter-group.h \
clutter-rectangle.h \ $(srcdir)/clutter-stage.h \
clutter-texture.h \ $(srcdir)/clutter-rectangle.h \
clutter-clone-texture.h \ $(srcdir)/clutter-texture.h \
clutter-video-texture.h \ $(srcdir)/clutter-clone-texture.h \
clutter-label.h \ $(srcdir)/clutter-video-texture.h \
clutter-main.h $(srcdir)/clutter-label.h \
$(srcdir)/clutter-main.h
clutter-marshal.h: clutter-marshal.list clutter-marshal.h: clutter-marshal.list
( $(GLIB_GENMARSHAL) --prefix=clutter_marshal $(srcdir)/clutter-marshal.list --header > clutter-marshal.h ) ( $(GLIB_GENMARSHAL) --prefix=clutter_marshal \
$(srcdir)/clutter-marshal.list --header > clutter-marshal.h )
clutter-marshal.c: clutter-marshal.h clutter-marshal.c: clutter-marshal.h
( $(GLIB_GENMARSHAL) --prefix=clutter_marshal $(srcdir)/clutter-marshal.list --body --header > clutter-marshal.c ) ( $(GLIB_GENMARSHAL) --prefix=clutter_marshal \
$(srcdir)/clutter-marshal.list --body --header > clutter-marshal.c )
clutter-enum-types.h: stamp-clutter-enum-types.h clutter-enum-types.h: stamp-clutter-enum-types.h
@true @true

1
doc/reference/tmpl/clutter-main.sgml
View file

@ -45,6 +45,7 @@ clutter-main
@a...: @a...:
@a...: @a...:
@a...: @a...:
@a...:
<!-- ##### MACRO CLUTTER_GLERR ##### --> <!-- ##### MACRO CLUTTER_GLERR ##### -->