brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Use template for ClutterX11 enumerationt types

Browse Source 
Clutter and Cogl use the template Makefile.am.enums for building the
enumeration GTypes from public headers, but ClutterX11 is not.
This commit is contained in:
Emmanuele Bassi 2010-02-24 10:20:10 +00:00
parent eb35c446b1
commit d54af2363d
2 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitignore vendored
View File

@ -13,20 +13,21 @@ clutter.pc
*.la
*.gcov
ChangeLog*
clutter/clutter-enum-types.[ch]
clutter/clutter-marshal.[ch]
clutter/clutter-version.h
clutter/stamp-*
stamp-enum-types
stamp-marshal
/clutter/clutter-enum-types.[ch]
/clutter/clutter-marshal.[ch]
/clutter/clutter-version.h
/clutter/gcov-report.txt
/clutter/clutter-json.h
/clutter/cogl/cogl/cogl-defines.h
/clutter/cogl/cogl/*.pc
/clutter/cogl/cogl/cogl-enum-types.[ch]
/clutter/cogl/cogl/stamp-enum-types
/clutter/cogl/cogl/driver/gl/cogl-defines.h
/clutter/cogl/cogl/driver/gles/cogl-defines.h
/clutter/cogl/cogl/driver/gles/cogl-fixed-vertex-shader.[ch]
/clutter/cogl/cogl/driver/gles/cogl-fixed-fragment-shader.[ch]
/clutter/x11/clutter-x11-enum-types.[ch]
*.gir
*.typelib
/clutter/json/*.gir
@ -253,8 +254,6 @@ TAGS
/tests/micro-bench/test-text
/tests/micro-bench/test-picking
/tests/tools/disable-npots.sh
/clutter/x11/clutter-x11-enum-types.[ch]
/clutter/x11/stamp-clutter-x11-enum-types.h
/po/Makefile.in.in
/po/POTFILES
/po/*.pot

73
clutter/x11/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/build/autotools/Makefile.am.silent
NULL =
INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterX11\" \
-DCLUTTER_COMPILATION \
@ -18,48 +20,39 @@ source_h = \
$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
$(top_srcdir)/clutter/x11/clutter-x11.h
BUILT_SOURCES = clutter-x11-enum-types.h clutter-x11-enum-types.c
BUILT_SOURCES =
clutter-x11-enum-types.h: stamp-clutter-x11-enum-types.h
@true
stamp-clutter-x11-enum-types.h: $(source_h) Makefile
$(QUIET_GEN)( $(GLIB_MKENUMS) \
--template $(srcdir)/clutter-x11-enum-types.h.in \
$(source_h) ) >> xgen-ceth && \
(cmp -s xgen-ceth clutter-x11-enum-types.h || cp xgen-ceth clutter-x11-enum-types.h ) && \
rm -f xgen-ceth && \
echo timestamp > $(@F)
EXTRA_DIST =
clutter-x11-enum-types.c: clutter-x11-enum-types.h
$(QUIET_GEN)( $(GLIB_MKENUMS) \
--template $(srcdir)/clutter-x11-enum-types.c.in \
$(source_h) ) >> xgen-cetc && \
cp xgen-cetc clutter-x11-enum-types.c && \
rm -f xgen-cetc
CLEANFILES =
DISTCLEANFILES =
# glib-mkenums rules
glib_enum_h = clutter-x11-enum-types.h
glib_enum_c = clutter-x11-enum-types.c
glib_enum_headers = $(source_h)
include $(top_srcdir)/build/autotools/Makefile.am.enums
noinst_LTLIBRARIES = libclutter-x11.la
libclutter_x11_la_SOURCES = \
clutter-backend-x11.h \
clutter-backend-x11.c \
clutter-device-manager-x11.h \
clutter-device-manager-x11.c \
clutter-event-x11.c \
clutter-input-device-x11.h \
clutter-input-device-x11.c \
clutter-stage-x11.h \
clutter-stage-x11.c \
clutter-x11-enum-types.h \
clutter-x11-enum-types.c \
clutter-x11-texture-pixmap.h \
clutter-x11-texture-pixmap.c \
clutter-x11.h
$(srcdir)/clutter-backend-x11.h \
$(srcdir)/clutter-backend-x11.c \
$(srcdir)/clutter-device-manager-x11.h \
$(srcdir)/clutter-device-manager-x11.c \
$(srcdir)/clutter-event-x11.c \
$(srcdir)/clutter-input-device-x11.h \
$(srcdir)/clutter-input-device-x11.c \
$(srcdir)/clutter-stage-x11.h \
$(srcdir)/clutter-stage-x11.c \
$(srcdir)/clutter-x11-texture-pixmap.c \
clutter-x11-enum-types.h \
clutter-x11-enum-types.c \
$(NULL)
libclutter_x11_includedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter/x11
libclutter_x11_include_HEADERS = \
clutter-x11.h \
clutter-x11-enum-types.h \
clutter-x11-texture-pixmap.h
libclutter_x11_include_HEADERS = $(source_h) clutter-x11-texture-pixmap.h
clutter-x11-$(CLUTTER_API_VERSION).pc: clutter-x11.pc
@cp -f $< $(@F)
@ -67,14 +60,6 @@ clutter-x11-$(CLUTTER_API_VERSION).pc: clutter-x11.pc
pkgconfig_DATA = clutter-x11-@CLUTTER_API_VERSION@.pc
pkgconfigdir = $(libdir)/pkgconfig
CLEANFILES = clutter-x11-$(CLUTTER_API_VERSION).pc
CLEANFILES += clutter-x11-$(CLUTTER_API_VERSION).pc
DISTCLEANFILES = \
stamp-clutter-x11-enum-types.h \
clutter-x11-enum-types.h \
clutter-x11-enum-types.c
EXTRA_DIST = \
clutter-x11.pc.in \
clutter-x11-enum-types.h.in \
clutter-x11-enum-types.c.in
EXTRA_DIST += clutter-x11.pc.in