* Makefile.am:

* TODO:
* ccss-clutter/Makefile.am:
* ccss-clutter/ccss-clutter.c (ccss_clutter_paint):
* ccss-clutter/ccss-clutter.h:
* ccss-clutter/example-2.c (create_actor):
* ccss-gtk/Makefile.am:
* ccss/Makefile.am:
* configure.in:
Fix linking.

10 files changed, 110 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index ae01011..b95d553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,39 @@
 2008-11-07  Robert Staudinger  <robsta@gnome.org>
 
+	* Makefile.am:
+	* TODO:
+	* ccss-clutter/Makefile.am:
+	* ccss-clutter/ccss-clutter.c (ccss_clutter_paint):
+	* ccss-clutter/ccss-clutter.h:
+	* ccss-clutter/example-2.c (create_actor):
+	* ccss-gtk/Makefile.am:
+	* ccss/Makefile.am:
+	* configure.in:
+	Fix linking.
+
+2008-11-07  Robert Staudinger  <robsta@gnome.org>
+
+	* cccss/Makefile.am:
+	* cccss/cccss.c:
+	* cccss/cccss.h:
+	* cccss/example-1.c:
+	* cccss/example-1.css:
+	* cccss/example-2.c:
+	* cccss/example-2.css:
+	* cccss/foo.svg:
+	* ccss-clutter/Makefile.am:
+	* ccss-clutter/ccss-clutter.c (get_type), (get_id),
+	(ccss_clutter_paint):
+	* ccss-clutter/ccss-clutter.h:
+	* ccss-clutter/example-1.c (paint_css), (main):
+	* ccss-clutter/example-1.css:
+	* ccss-clutter/example-2.c (url), (create_actor), (main):
+	* ccss-clutter/example-2.css:
+	* ccss-clutter/foo.svg:
+	Use new naming scheme for the experimental clutter code.
+
+2008-11-07  Robert Staudinger  <robsta@gnome.org>
+
 	* ccss-gtk/Makefile.am:
 	* ccss-gtk/ccss-gtk.sym:
 	* ccss-gtk/ccss-gtk.sym.in:
diff --git a/Makefile.am b/Makefile.am
index 4213355..83381eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libccss-1.pc
 
 if CCSS_WITH_CLUTTER
-SUBDIRS += cccss
+SUBDIRS += ccss-clutter
 endif
 
 if CCSS_WITH_GTK
diff --git a/TODO b/TODO
index c36b6aa..eddb4fa 100644
--- a/TODO
+++ b/TODO
@@ -24,3 +24,8 @@ Also see gtk-css-engine's TODO for now.
 * Callback-based stylesheet-iteration API, then selector-group can be totally internal. Get rid of <glib.h> in all public headers.
 * There is currently no way to free inline blocks, e.g. when a document is dynamically creating and deleting nodes with inline styling. In this case the inline styles will live as long as the stylesheet they are associated to.
 
+0.3
+---
+
+* Separate cairo-dependent code.
+
diff --git a/ccss-clutter/Makefile.am b/ccss-clutter/Makefile.am
index 60f48a2..05f456a 100644
--- a/ccss-clutter/Makefile.am
+++ b/ccss-clutter/Makefile.am
@@ -4,19 +4,19 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir)
 
-noinst_LTLIBRARIES = libcccss.la
+noinst_LTLIBRARIES = libccss-clutter.la
 
-libcccss_la_LIBADD = \
+libccss_clutter_la_LIBADD = \
 	$(CCSS_CLUTTER_LIBS) \
 	./../ccss/libccss-1.la
 
-libcccss_la_SOURCES = \
-	cccss.c \
-	cccss.h
+libccss_clutter_la_SOURCES = \
+	ccss-clutter.c \
+	ccss-clutter.h
 
 LDADD = \
-	$(libcccss_la_LIBADD) \
-	./libcccss.la
+	$(libccss_clutter_la_LIBADD) \
+	./libccss-clutter.la
 
 noinst_PROGRAMS = \
 	example-1 \
diff --git a/ccss-clutter/ccss-clutter.c b/ccss-clutter/ccss-clutter.c
index 5ce9a56..a18fb64 100644
--- a/ccss-clutter/ccss-clutter.c
+++ b/ccss-clutter/ccss-clutter.c
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-#include "cccss.h"
+#include "ccss-clutter.h"
 
 typedef struct {
 	ccss_node_t	 parent;
@@ -50,13 +50,13 @@ static ccss_node_class_t _node_class = {
 	.release		= NULL
 };
 
-gboolean
-cccss_paint (ccss_stylesheet_t const	*stylesheet,
-	     ClutterCairo		*actor,
-	     gint			 x,
-	     gint			 y,
-	     gint			 width,
-	     gint			 height)
+bool
+ccss_clutter_paint (ccss_stylesheet_t const	*stylesheet,
+		    ClutterCairo		*actor,
+		    int				 x,
+		    int				 y,
+		    int				 width,
+		    int				 height)
 {
 	cairo_t			*cr;
 	ccss_style_t		*style;
diff --git a/ccss-clutter/ccss-clutter.h b/ccss-clutter/ccss-clutter.h
index a43e4e0..07890a7 100644
--- a/ccss-clutter/ccss-clutter.h
+++ b/ccss-clutter/ccss-clutter.h
@@ -17,14 +17,20 @@
  * MA 02110-1301, USA.
  */
 
-#ifndef CCCSS_H
-#define CCCSS_H
+#ifndef CCSS_CLUTTER_H
+#define CCSS_CLUTTER_H
 
-#include <ccss/ccss.h>
+#include <stdbool.h>
 #include <clutter-cairo/clutter-cairo.h>
+#include <ccss/ccss.h>
 
-gboolean cccss_paint (ccss_stylesheet_t const *stylesheet, ClutterCairo *actor,
-		      gint x, gint y, gint width, gint height);
+bool
+ccss_clutter_paint (ccss_stylesheet_t const	*stylesheet,
+		    ClutterCairo		*actor,
+		    int				 x,
+		    int				 y,
+		    int				 width,
+		    int				 height);
 
-#endif /* CCCSS_H */
+#endif /* CCSS_CLUTTER_H */
 
diff --git a/ccss-clutter/example-2.c b/ccss-clutter/example-2.c
index a7c06b6..5f73c0e 100644
--- a/ccss-clutter/example-2.c
+++ b/ccss-clutter/example-2.c
@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include <cccss/cccss.h>
 #include <clutter/clutter.h>
+#include <ccss-clutter/ccss-clutter.h>
 
 /* FIXME put your prefix here or fix the `url' functin below to resolve it. */
 #define PREFIX "/home/rstaudinger/Desktop/Devel/gtk-css-engine-build/libccss/cccss"
@@ -57,7 +57,7 @@ create_actor (ccss_stylesheet_t	const	*stylesheet,
 	clutter_actor_show (actor);
 	/* Set name tag and paint. */
 	clutter_actor_set_name (actor, name);
-	cccss_paint (stylesheet, CLUTTER_CAIRO (actor), 0, 0, 150, 30);
+	ccss_clutter_paint (stylesheet, CLUTTER_CAIRO (actor), 0, 0, 150, 30);
 }
 
 int
diff --git a/ccss-gtk/Makefile.am b/ccss-gtk/Makefile.am
index dbd5870..295e75a 100644
--- a/ccss-gtk/Makefile.am
+++ b/ccss-gtk/Makefile.am
@@ -11,7 +11,7 @@ libccss_gtk_1_la_DEPENDENCIES = \
 
 libccss_gtk_1_la_LIBADD = \
 	$(CCSS_GTK_LIBS) \
-	../ccss/.libs/libccss.lai
+	../ccss/libccss-static.la
 
 libccss_gtk_1_la_LDFLAGS = -no-undefined -version-info $(VERSION_INFO)
 
diff --git a/ccss/Makefile.am b/ccss/Makefile.am
index 365c775..7df50f7 100644
--- a/ccss/Makefile.am
+++ b/ccss/Makefile.am
@@ -1,38 +1,21 @@
 
-lib_LTLIBRARIES = libccss-1.la
+### Build in `noinst' manner so in can be statically ###########################
+### linked into -cairo et al variants. #########################################
+
+noinst_LTLIBRARIES = libccss-static.la libccssproperty.la
 
-libccss_1_la_CPPFLAGS = \
+libccss_static_la_CPPFLAGS = \
 	$(CCSS_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir)
 
-libccss_1_la_DEPENDENCIES = \
-	ccss.sym \
+libccss_static_la_DEPENDENCIES = \
 	libccssproperty.la
 
-libccss_1_la_LIBADD = \
-	$(CCSS_LIBS) \
+libccss_static_la_LIBADD = \
 	libccssproperty.la
 
-libccss_1_la_LDFLAGS = -no-undefined -version-info $(VERSION_INFO)
-
-if CCSS_DEBUG
-else
-libccss_1_la_LDFLAGS += -export-symbols $(srcdir)/ccss.sym
-endif
-
-headersdir = $(includedir)/libccss-1/ccss
-
-headers_DATA = \
-	ccss-function.h \
-	ccss.h \
-	ccss-macros.h \
-	ccss-node.h \
-	ccss-style.h \
-	ccss-stylesheet.h
-
-libccss_1_la_SOURCES = \
-	$(headers_DATA) \
+libccss_static_la_SOURCES = \
 	ccss-background.c \
 	ccss-background.h \
 	ccss-background-parser.c \
@@ -63,11 +46,40 @@ libccss_1_la_SOURCES = \
 	ccss-style-priv.h \
 	ccss-stylesheet.c
 
+### The actual shared lib. #####################################################
+
+lib_LTLIBRARIES = libccss-1.la
+
+libccss_1_la_DEPENDENCIES = \
+	ccss.sym \
+	libccss-static.la
+
+libccss_1_la_LDFLAGS = -no-undefined -version-info $(VERSION_INFO)
+if CCSS_DEBUG
+else
+libccss_1_la_LDFLAGS += -export-symbols $(srcdir)/ccss.sym
+endif
+
+libccss_1_la_LIBADD = \
+	$(CCSS_LIBS) \
+	libccss-static.la
+
+libccss_1_la_SOURCES = \
+	$(headers_DATA)
+
+headersdir = $(includedir)/libccss-1/ccss
+
+headers_DATA = \
+	ccss-function.h \
+	ccss.h \
+	ccss-macros.h \
+	ccss-node.h \
+	ccss-style.h \
+	ccss-stylesheet.h
+
 # Messing with function pointers in a non-ISO way needs some extra love
 # to prevent warnings (not using ISO C).
 
-noinst_LTLIBRARIES = libccssproperty.la
-
 libccssproperty_la_CPPFLAGS = \
 	$(CCSS_COMPAT_CFLAGS) \
 	-I$(top_srcdir) \
diff --git a/configure.in b/configure.in
index ece6f19..677ae3f 100644
--- a/configure.in
+++ b/configure.in
@@ -296,8 +296,8 @@ AC_CONFIG_FILES([
   Makefile
   libccss-1.pc
   libccss-gtk-1.pc
-  cccss/Makefile
   ccss/Makefile
+  ccss-clutter/Makefile
   ccss-gtk/Makefile
   doc/Makefile
   doc/version.xml