From 1c8a6bc09b8fa877ff337fefa54c53db20599e2f Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 29 May 2009 12:50:48 +0100
Subject: [PATCH] [build] Encode the target into the backend library

The libclutter-cogl internal object should be the only dependency
for Clutter, since we are already copying it inside clutter/cogl
for the introspection scanner. For this reason, the backend-specific,
real internal object should be built with the backend encoded into
the file name, like libclutter-common. This makes the build output
a little bit more clear: instead of having two:

  LINK libclutter-cogl-common.la
  ...
  LINK libclutter-cogl.la
  LINK libclutter-cogl.la

We'll have:

  LINK libclutter-cogl-common.la
  ...
  LINK libclutter-cogl-gl.la
  LINK libclutter-cogl.la

Same applies for the GLES backend.
---
 Makefile.am      |  4 ++--
 gl/Makefile.am   | 10 +++++-----
 gles/Makefile.am | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1490ec68a..4cbcef334 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,14 +52,14 @@ cogl_headers = \
 # so we create a libclutter-cogl.la that's just identical to the one
 # in the subdir
 noinst_LTLIBRARIES = libclutter-cogl.la
-libclutter_cogl_la_LIBADD = $(CLUTTER_COGL)/libclutter-cogl.la
+libclutter_cogl_la_LIBADD = $(CLUTTER_COGL)/libclutter-cogl-$(CLUTTER_COGL).la
 libclutter_cogl_la_SOURCES = $(cogl_headers)
 
 coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
 coglinclude_HEADERS = $(cogl_headers)
 
 if HAVE_INTROSPECTION
-Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(CLUTTER_COGL)/libclutter-cogl.la
+Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la
 	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
 		--namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \
 		-I$(top_srcdir)/clutter/cogl \
diff --git a/gl/Makefile.am b/gl/Makefile.am
index dc33e0bb1..1aab5b649 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -45,12 +45,12 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"Cogl-GL\" \
 	-DCLUTTER_COMPILATION
 
-noinst_LTLIBRARIES = libclutter-cogl.la
+noinst_LTLIBRARIES = libclutter-cogl-gl.la
 
-libclutter_cogl_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
-libclutter_cogl_la_LIBADD = -lm $(CLUTTER_LIBS) $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
-libclutter_cogl_la_DEPENDENCIES = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
-libclutter_cogl_la_SOURCES = \
+libclutter_cogl_gl_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
+libclutter_cogl_gl_la_LIBADD = -lm $(CLUTTER_LIBS) $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
+libclutter_cogl_gl_la_DEPENDENCIES = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
+libclutter_cogl_gl_la_SOURCES = \
 	$(top_builddir)/clutter/cogl/cogl.h 	\
 	$(cogl_headers) 			\
 	$(cogl_priv_headers)			\
diff --git a/gles/Makefile.am b/gles/Makefile.am
index 3f84b4b2f..3ce5365a7 100644
--- a/gles/Makefile.am
+++ b/gles/Makefile.am
@@ -27,12 +27,12 @@ INCLUDES = \
         -DG_LOG_DOMAIN=\"Cogl-GLES\" \
         -DCLUTTER_COMPILATION
 
-noinst_LTLIBRARIES = libclutter-cogl.la
+noinst_LTLIBRARIES = libclutter-cogl-gles.la
 
-libclutter_cogl_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
-libclutter_cogl_la_LIBADD = -lm $(CLUTTER_LIBS) $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
-libclutter_cogl_la_DEPENDENCIES = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
-libclutter_cogl_la_SOURCES = \
+libclutter_cogl_gles_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
+libclutter_cogl_gles_la_LIBADD = -lm $(CLUTTER_LIBS) $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
+libclutter_cogl_gles_la_DEPENDENCIES = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
+libclutter_cogl_gles_la_SOURCES = \
 	$(top_builddir)/clutter/cogl/cogl.h \
 	$(top_builddir)/clutter/cogl/cogl-defines-gles.h \
         $(top_builddir)/clutter/cogl/cogl-color.h \
@@ -60,7 +60,7 @@ libclutter_cogl_la_SOURCES = \
 	cogl-shader.c
 
 if USE_GLES2_WRAPPER
-libclutter_cogl_la_SOURCES += \
+libclutter_cogl_gles_la_SOURCES += \
 	cogl-gles2-wrapper.c \
 	cogl-fixed-vertex-shader.h \
 	cogl-fixed-vertex-shader.c \