brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
aeb1516a89
mutter/Makefile.am

80 lines
2.3 KiB
Makefile
Raw Normal View History

Merged clutter-ivan branch into trunk. svn merge \ https://svn.o-hand.com/repos/clutter/trunk/clutter@2509 \ https://svn.o-hand.com/repos/clutter/branches/clutter-ivan@HEAD
2008-04-25 09:37:36 -04:00
SUBDIRS = common $(CLUTTER_COGL)
2007-03-27 Matthew Allum <mallum@openedhand.com> * clutter/clutter-feature.c: Rejig ifdef's a little. Make drm vblanking Linux only. * clutter/clutter-stage.c: * clutter/clutter-stage.h: Add a perspective boxed type. * clutter/glx/clutter-stage-glx.c: Add some FIXMEs * clutter/Makefile.am: * clutter/cogl/Makefile.am: * clutter/cogl/cogl.h: * clutter/cogl/gl/Makefile.am: * clutter/cogl/gl/cogl.c: * configure.ac: Very initial work on 'cogl' GL/GLES abstraction/utility code.
2007-03-26 19:18:39 -04:00
[build] Add cogl.h to the built sources list The main COGL header file is generated at configure time. If something changes in the template, though, the file will not be regenerated. Adding cogl.h to the BUILT_SOURCES list will allow the regeneration to happen.
2009-02-12 07:42:58 -05:00
BUILT_SOURCES = cogl.h
Add pkg-config file for COGL COGL should ship its own pkg-config file, obviously still pointing to Clutter's compiler flags and linking options, for COGL-specific variables that might be queried at configure time. For instance, it's easier (and less verbose) to do: PKG_CHECK_EXISTS([cogl-gl-1.0], [has_gl_backend=yes], [has_gl_backend=no]) Than doing: AC_MSG_CHECKING([for GL support in COGL]) cogl_backend=`$PKG_CONFIG --variable=cogl clutter-0.9` if test x$cogl_backend = xgl; then has_gl_backend=yes AC_MSG_RESULT([found]) else has_gl_backend=no AC_MSG_RESULT([not found]) fi
2009-02-28 12:54:27 -05:00
EXTRA_DIST = cogl.h.in cogl.pc.in
2007-03-27 Matthew Allum <mallum@openedhand.com> * clutter/cogl/Makefile.am: * clutter/cogl/cogl.h: * clutter/cogl/gles/Makefile.am: * clutter/cogl/gles/cogl.c: Begin poplulating cogl GLES code. * configure.ac: * clutter/egl/clutter-event-egl.c: * clutter/egl/clutter-stage-egl.c: * clutter/egl/clutter-stage-egl.h: * clutter/egl/clutter-backend-egl.c: * clutter/egl/clutter-backend-egl.h: * clutter/egl/clutter-egl.h: Add initial EGL/X backend work mostly ported from backend branch. Builds but untested as yet. * clutter/glx/clutter-stage-glx.c: Only include XFixes Header if we have have it. * clutter/clutter-behaviour.c: (clutter_behaviour_apply): * clutter/clutter-behaviour.h: Add clutter_behaviour_is_applied()
2007-03-27 17:09:11 -04:00
Fixed 'make dist' * clutter/cogl/Makefile.am (EXTRA_DIST): Distribute cogl.h.in instead of cogl.h (DIST_SUBDIRS): Added common folder * clutter/cogl/gl/Makefile.am (libclutter_cogl_la_SOURCES): Remove cogl-defines.h and use the right location for cogl-defines.gl.h (EXTRA_DIST): Distribute cogl-defines.h.in * clutter/cogl/gles/Makefile.am (libclutter_cogl_la_SOURCES): Remove cogl-defines.h and use the right location for cogl-defines.gles.h (EXTRA_DIST): Distribute cogl-defines.h.in * clutter/Makefile.am (DIST_SUBDIRS): Add fruity
2008-04-28 12:57:44 -04:00
DIST_SUBDIRS = common gl gles
Add pkg-config file for COGL COGL should ship its own pkg-config file, obviously still pointing to Clutter's compiler flags and linking options, for COGL-specific variables that might be queried at configure time. For instance, it's easier (and less verbose) to do: PKG_CHECK_EXISTS([cogl-gl-1.0], [has_gl_backend=yes], [has_gl_backend=no]) Than doing: AC_MSG_CHECKING([for GL support in COGL]) cogl_backend=`$PKG_CONFIG --variable=cogl clutter-0.9` if test x$cogl_backend = xgl; then has_gl_backend=yes AC_MSG_RESULT([found]) else has_gl_backend=no AC_MSG_RESULT([not found]) fi
2009-02-28 12:54:27 -05:00
pc_files = \
cogl-$(CLUTTER_COGL)-$(CLUTTER_API_VERSION).pc \
cogl-$(CLUTTER_API_VERSION).pc
cogl-$(CLUTTER_API_VERSION).pc: cogl.pc
$(QUIET_GEN)cp -f $< $(@F)
cogl-$(CLUTTER_COGL)-$(CLUTTER_API_VERSION).pc: cogl.pc
$(QUIET_GEN)cp -f $< $(@F)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files)
CLEANFILES = $(pc_files)
[build] Build Cogl introspection data Currently, the introspection data for Cogl is built right into Clutter's own typelib. This makes functions like: cogl_path_round_rectangle() Appear as: Clutter.cogl_path_round_rectangle() It should be possible, instead, to have a Cogl namespace and: Cogl.path_round_rectangle() This means building introspection data for Cogl alone. Unfortunately, there are three types defined in Cogl that confuse the introspection scanner, and make it impossible to build a typelib: COGLint COGLuint COGLenum These three types should go away before 1.0, substituted by int, unsigned int and proper enumeration types. For this reason, we can just set up the GIR build and wait until the last moment to create the typelib. Once that has been done, we will be able to safely remove the Cogl API from the Clutter GIR and typelib and let people import Cogl if they want to use the Cogl API via introspection.
2009-05-06 06:18:31 -04:00
AM_CPPFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
if HAVE_INTROSPECTION
cogl_headers = \
$(top_srcdir)/clutter/cogl/cogl-bitmap.h \
$(top_srcdir)/clutter/cogl/cogl-color.h \
$(top_srcdir)/clutter/cogl/cogl-debug.h \
$(top_srcdir)/clutter/cogl/cogl-fixed.h \
$(top_srcdir)/clutter/cogl/cogl-material.h \
$(top_srcdir)/clutter/cogl/cogl-matrix.h \
$(top_srcdir)/clutter/cogl/cogl-offscreen.h \
$(top_srcdir)/clutter/cogl/cogl-path.h \
$(top_srcdir)/clutter/cogl/cogl-shader.h \
$(top_srcdir)/clutter/cogl/cogl-texture.h \
$(top_srcdir)/clutter/cogl/cogl-types.h \
$(top_srcdir)/clutter/cogl/cogl-vertex-buffer.h
Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(CLUTTER_COGL)/libclutter-cogl.la
$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
--namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \
-I$(top_srcdir)/clutter/cogl \
-I$(top_srcdir)/clutter/cogl/common \
-I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ \
-I$(top_builddir)/clutter \
-DCLUTTER_COMPILATION \
--include=GL-1.0 \
--include=GObject-2.0 \
--library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
--libtool="$(top_builddir)/doltlibtool" \
--pkg gobject-2.0 \
--output $@ \
$(top_builddir)/clutter/cogl/cogl-defines-@CLUTTER_COGL@.h \
$(top_builddir)/clutter/cogl/cogl.h \
$(cogl_headers)
BUILT_GIRSOURCES = Cogl-@CLUTTER_API_VERSION@.gir
[build] Unbreak compilation When building Clutter with introspection enabled everything stops at Cogl GIR generation because it depends on the installed library to work. Since we still require some changes in the API to be able to build the GIR and the typelib for Cogl we should disable the generation of the GIR as well.
2009-05-09 19:41:17 -04:00
#girdir = $(datadir)/gir-1.0
#gir_DATA = $(BUILT_GIRSOURCES)
[build] Build Cogl introspection data Currently, the introspection data for Cogl is built right into Clutter's own typelib. This makes functions like: cogl_path_round_rectangle() Appear as: Clutter.cogl_path_round_rectangle() It should be possible, instead, to have a Cogl namespace and: Cogl.path_round_rectangle() This means building introspection data for Cogl alone. Unfortunately, there are three types defined in Cogl that confuse the introspection scanner, and make it impossible to build a typelib: COGLint COGLuint COGLenum These three types should go away before 1.0, substituted by int, unsigned int and proper enumeration types. For this reason, we can just set up the GIR build and wait until the last moment to create the typelib. Once that has been done, we will be able to safely remove the Cogl API from the Clutter GIR and typelib and let people import Cogl if they want to use the Cogl API via introspection.
2009-05-06 06:18:31 -04:00
#typelibsdir = $(libdir)/girepository-1.0
#typelibs_DATA = Cogl-@CLUTTER_API_VERSION@.typelib
#%.typelib: %.gir $(INTROSPECTION_COMPILER)
# $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) \
# --includedir=$(top_builddir)/clutter \
# --includedir=$(top_srcdir)/clutter \
# --includedir=$(srcdir) \
# --includedir=. \
# $(INTROSPECTION_COMPILER_OPTS) \
# $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) #$(typelibs_DATA)
endif
Reference in New Issue Copy Permalink