gtk-css-engine r33 - in bzr-playground: . libccd libccd/ccd

[robsta svn gnome org]

Author: robsta
Date: Mon Aug 18 13:51:14 2008
New Revision: 33
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=33&view=rev

Log:
Complete standalone libccd build infrastructure.

Added:
   bzr-playground/libccd/libccd-1.pc.in
Modified:
   bzr-playground/   (props changed)
   bzr-playground/configure.in
   bzr-playground/libccd/Makefile.am
   bzr-playground/libccd/ccd/Makefile.am
   bzr-playground/libccd/ccd/ccd-parser.c

Modified: bzr-playground/configure.in
==============================================================================
--- bzr-playground/configure.in	(original)
+++ bzr-playground/configure.in	Mon Aug 18 13:51:14 2008
@@ -6,25 +6,12 @@
 # Guessing some version.
 AC_PREREQ(2.54)
 
-# Making releases:
-#   CCD_MICRO_VERSION += 1;
-#   CCD_INTERFACE_AGE += 1;
-#   CCD_BINARY_AGE += 1;
-# if any functions have been added, set CCD_INTERFACE_AGE to 0.
-# if backwards compatibility has been broken,
-# set CCD_BINARY_AGE and CCD_INTERFACE_AGE to 0.
-
 m4_define([ccd_version_major], [0])
 m4_define([ccd_version_minor], [0])
 m4_define([ccd_version_micro], [9])
-m4_define([ccd_version_extra], [trunk])
-m4_define([ccd_interface_age], [0])
-
-m4_define([ccd_binary_age],
-  [m4_eval(100 * ccd_minor_version + ccd_micro_version)])
-
+m4_define([ccd_version_extra], [.trunk])
 m4_define([ccd_version],
-  [ccd_version_major.ccd_version_minor.ccd_version_micro[]ccd_version_extra])
+    [ccd_version_major.ccd_version_minor.ccd_version_micro[]ccd_version_extra])
 
 AC_INIT([gtk-css-engine], [ccd_version])
 AC_CONFIG_HEADERS([config.h])
@@ -34,14 +21,21 @@
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
-# TODO
-#m4_define([lt_current], [m4_eval(100 * ccd_minor_version + ccd_micro_version - ccd_interface_age)])
-#m4_define([lt_revision], [ccd_interface_age])
-#m4_define([lt_age], [m4_eval(ccd_binary_age - ccd_interface_age)])
-#LT_VERSION_INFO="lt_current:lt_revision:lt_age"
-#AC_SUBST(LT_VERSION_INFO)
-LT_VERSION_INFO="0:0:0"
-AC_SUBST(LT_VERSION_INFO)
+dnl Version info for libraries = CURRENT:REVISION:AGE
+dnl
+dnl Within each x.y.*, ABI is maintained backward and _forward_ compatible.
+dnl (As a consequence, no exported function may be added.)
+dnl So it's enough to have one interface number per each x.y.* branch.
+dnl
+dnl OTOH, we are not able to keep ABI strictly backward compatible throughout
+dnl the whole x.*.*.
+dnl The easiest way is to declare no ABI compatibility, ie. AGE is always 0.
+dnl
+m4_define([version_iface],
+	m4_eval(100 * ccd_version_major + ccd_version_minor))
+
+AC_SUBST([VERSION_INFO], [version_iface:ccd_version_micro:0])
+
 
 ### Checks for configure arguments. ############################################
 
@@ -81,6 +75,7 @@
   fi  
 ])
 
+
 ### Checks for programs. #######################################################
 
 AC_PROG_CC
@@ -110,34 +105,37 @@
 
 # Guessing a version.
 rsvg_req='librsvg-2.0 >= 2.16'
-ccd_cv_rsvg="no"
+with_rsvg="no"
 PKG_CHECK_EXISTS([ $rsvg_req ],
 [
-  ccd_cv_rsvg="yes"
+  with_rsvg="yes"
   pkgs="$pkgs $rsvg_req"
 ])
 
-PKG_CHECK_MODULES(GCE, $pkgs)
+PKG_CHECK_MODULES(CCD, $pkgs)
 
-AC_SUBST([GCE_CFLAGS])
-AC_SUBST([GCE_LIBS])
+AC_SUBST([CCD_CFLAGS])
+AC_SUBST([CCD_LIBS])
+AC_SUBST([CCD_DEPS], $pkgs)
 
 AC_DEFINE([CCD_WITH_GTK], [1], [Support for drawing Gtk+ primitives like `box-gap'])
 AM_CONDITIONAL([CCD_WITH_GTK], [test "yes" = "yes"])
 
-if test "$ccd_cv_rsvg" = "yes"; then
+if test "$with_rsvg" = "yes"; then
   AC_DEFINE([CCD_WITH_RSVG], [1], [SVG support through the `rsvg' library])
 fi
-AM_CONDITIONAL([CCD_WITH_RSVG], [test "$ccd_cv_rsvg" = "yes"])
+AM_CONDITIONAL([CCD_WITH_RSVG], [test "$with_rsvg" = "yes"])
+
+AC_SUBST([GCE_CFLAGS], [$CCD_CFLAGS])
+AC_SUBST([GCE_LIBS], [$CCD_LIBS])
 
-AC_SUBST([CCD_CFLAGS], [$GCE_CFLAGS])
-AC_SUBST([CCD_LIBS], [$GCE_LIBS])
 
 ### Checks for header files. ###################################################
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdbool.h stdint.h stdio.h stdlib.h string.h])
 
+
 ### Checks for typedefs, structures, and compiler characteristics. #############
 
 AC_C_CONST
@@ -166,6 +164,7 @@
 AC_CONFIG_FILES([
   Makefile
   libccd/Makefile
+  libccd/libccd-1.pc
   libccd/ccd/Makefile
   libccd/doc/Makefile
   libccd/doc/version.xml
@@ -181,6 +180,6 @@
 echo "
 Configuration
     Standalone libccd       $enable_libccd
-    Support for SVG images  $ccd_cv_rsvg
+    Support for SVG images  $with_rsvg
 "
 

Modified: bzr-playground/libccd/Makefile.am
==============================================================================
--- bzr-playground/libccd/Makefile.am	(original)
+++ bzr-playground/libccd/Makefile.am	Mon Aug 18 13:51:14 2008
@@ -5,3 +5,9 @@
 SUBDIRS += examples
 endif
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libccd-1.pc
+
+EXTRA_DIST = \
+	libccd-1.pc.in
+

Modified: bzr-playground/libccd/ccd/Makefile.am
==============================================================================
--- bzr-playground/libccd/ccd/Makefile.am	(original)
+++ bzr-playground/libccd/ccd/Makefile.am	Mon Aug 18 13:51:14 2008
@@ -6,19 +6,27 @@
 
 if CCD_STANDALONE
 lib_LTLIBRARIES = libccd-1.la
-libccd_1_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO)
+libccd_1_la_LDFLAGS = -no-undefined -version-info $(VERSION_INFO)
 headersdir = $(includedir)/libccd-1/ccd
 headers_DATA = \
 	ccd-background.h \
+	ccd-block.h \
 	ccd-border.h \
 	ccd-color.h \
+	ccd-features.h \
 	ccd-function.h \
 	ccd.h \
+	ccd-image.h \
 	ccd-node.h \
 	ccd-property.h \
 	ccd-selector-group.h \
+	ccd-selector.h \
 	ccd-style.h \
 	ccd-stylesheet.h
+if CCD_WITH_GTK
+headers_DATA += \
+	ccd-gtk-style.h
+endif
 else
 noinst_LTLIBRARIES = libccd-1.la
 endif
@@ -55,12 +63,16 @@
 	ccd-stylesheet.c \
 	ccd-stylesheet.h
 
+opt_src = 
+
 if CCD_WITH_GTK
 libccd_1_la_SOURCES += \
 	ccd-gtk-style.c \
 	ccd-gtk-style.h
+opt_src += $(libccd_1_la_SOURCES)
 endif
 
 EXTRA_DIST = \
+	$(opt_src) \
 	ccd-features.h.in
 

Modified: bzr-playground/libccd/ccd/ccd-parser.c
==============================================================================
--- bzr-playground/libccd/ccd/ccd-parser.c	(original)
+++ bzr-playground/libccd/ccd/ccd-parser.c	Mon Aug 18 13:51:14 2008
@@ -177,7 +177,7 @@
 		ccd_border_parse (&info->block->border, property, values);
 	} else if (0 == strcmp ("color", property)) {
 		info->block->color_spec = ccd_color_parse (&info->block->color, 
-							  &values);
+							   (CRTerm const **) &values);
 	}
 }
 

Added: bzr-playground/libccd/libccd-1.pc.in
==============================================================================
--- (empty file)
+++ bzr-playground/libccd/libccd-1.pc.in	Mon Aug 18 13:51:14 2008
@@ -0,0 +1,12 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: libgsf-1
+Description: The Cairo CSS Box Drawing Library
+Version: @VERSION@
+Requires: @CCD_DEPS@
+Libs: -L${libdir} -lccd-1
+Cflags: -I${includedir}/libccd-1
+