From c8d963f80d34e24cd68461faec18131941a09c9d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 21 Jun 2006 15:54:46 +0000 Subject: [PATCH] 2006-06-21 Emmanuele Bassi * clutter/Makefile.am: * bindings/python/Makefile.am: * Makefile.am: Fix distcheck --- ChangeLog | 6 ++++ Makefile.am | 2 +- bindings/python/Makefile.am | 49 ++++++++++++++-------------- clutter/Makefile.am | 37 +++++++++++---------- doc/reference/tmpl/clutter-main.sgml | 1 + 5 files changed, 53 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 872434825..d5e446a40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-21 Emmanuele Bassi + + * clutter/Makefile.am: + * bindings/python/Makefile.am: + * Makefile.am: Fix distcheck + 2006-06-21 Ross Burton * clutter/Makefile.am: diff --git a/Makefile.am b/Makefile.am index 19599bc3e..9cd8a3b94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ EXTRA_DIST = clutter.pc.in 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* MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \ diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index f09de78dc..3b73e64d7 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -1,45 +1,47 @@ AUTOMAKE_OPTIONS = 1.7 CLEANFILES = -EXTRA_DIST = CLUTTER_DEFS = clutter-base.defs CLUTTER_TYPES_DEFS = clutter-base-types.defs - -CREATEDEFS = $(PYTHON) createdefs.py - CLUTTER_OVERRIDES = clutter.override CLEANFILES += \ clutter.defs \ clutter-types.defs -EXTRA_DIST += \ - $(CLUTTER_DEFS) \ - $(CLUTTER_TYPES_DEFS) \ - $(CLUTTER_OVERRIDES) +EXTRA_DIST = \ + clutter-base.defs \ + clutter-base-types.defs \ + clutter.override -clutter.defs: $(CLUTTER_DEFS) - @echo "*** Creating clutter.defs" && \ - echo ";; -*- scheme -*-" > gen-cdefs && \ - echo ";; THIS FILE IS AUTOGENERATED" >> gen-cdefs && \ - for p in $(CLUTTER_DEFS); do \ - echo "(include \"$$p\")" >> gen-cdefs; \ - done && \ - (cmp -s gen-cdefs clutter.defs || cp gen-cdefs clutter.defs) && \ - rm -f gen-cdefs -clutter.defs: Makefile +clutter.defs: Makefile stamp-clutter.defs + @true +stamp-clutter.defs: $(CLUTTER_DEFS) + @echo "*** Creating clutter.defs" && \ + echo ";; -*- scheme -*-" > gen-cdefs && \ + echo ";; THIS FILE IS AUTOGENERATED" >> gen-cdefs && \ + for p in $(CLUTTER_DEFS); do \ + echo "(include \"$(top_srcdir)/bindings/python/$$p\")" >> gen-cdefs; \ + done && \ + (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 ";; -*- scheme -*-" > gen-ctdefs && \ echo ";; THIS FILE IS AUTOGENERATED" >> gen-ctdefs && \ for p in $(CLUTTER_TYPES_DEFS); do \ - echo "(include \"$$p\")" >> gen-ctdefs; \ + echo "(include \"$(top_srcdir)/bindings/python/$$p\")" >> gen-ctdefs; \ done && \ (cmp -s gen-ctdefs clutter-types.defs || cp gen-ctdefs clutter-types.defs) && \ - rm -f gen-ctdefs -clutter-types.defs: Makefile + rm -f gen-ctdefs && \ + echo "timestamp" > $(@F) + +CLEANFILES += stamp-clutter.defs stamp-clutter-types.defs clutter-pyglue.c: clutter.defs clutter-types.defs $(CLUTTER_OVERRIDES) $(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)/pango-types.defs \ --register clutter-types.defs \ - --override $(CLUTTER_OVERRIDES) \ + --override $(top_srcdir)/bindings/python/$(CLUTTER_OVERRIDES) \ --prefix clutter \ clutter.defs > gen-$@ && \ (cmp -s $@ gen-$@ || cp gen-$@ $@) && \ @@ -60,7 +62,6 @@ python_LTLIBRARIES = clutter.la 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_LIBADD = $(PYTHON_LIBS) $(PYGTK_LIBS) \ $(top_builddir)/clutter/libclutter-@CLUTTER_MAJORMINOR@.la diff --git a/clutter/Makefile.am b/clutter/Makefile.am index d9d780a30..e1c1d89ec 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -5,27 +5,30 @@ GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0` BUILT_SOURCES = $(MARSHALFILES) $(ENUMFILES) -source_h = clutter-keysyms.h \ - clutter-util.h \ - clutter-media.h \ - clutter-event.h \ - clutter-color.h \ - clutter-timeline.h \ - clutter-actor.h \ - clutter-group.h \ - clutter-stage.h \ - clutter-rectangle.h \ - clutter-texture.h \ - clutter-clone-texture.h \ - clutter-video-texture.h \ - clutter-label.h \ - clutter-main.h +source_h = \ + $(srcdir)/clutter-keysyms.h \ + $(srcdir)/clutter-util.h \ + $(srcdir)/clutter-media.h \ + $(srcdir)/clutter-event.h \ + $(srcdir)/clutter-color.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-video-texture.h \ + $(srcdir)/clutter-label.h \ + $(srcdir)/clutter-main.h 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 - ( $(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 @true diff --git a/doc/reference/tmpl/clutter-main.sgml b/doc/reference/tmpl/clutter-main.sgml index d2d9b9f33..14db54456 100644 --- a/doc/reference/tmpl/clutter-main.sgml +++ b/doc/reference/tmpl/clutter-main.sgml @@ -44,6 +44,7 @@ clutter-main @a...: @a...: @a...: +@a...: @a...: